Linus Torvalds 56b85f32d5 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 ... * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits) serial: apbuart: Fixup apbuart_console_init() TTY: Add tty ioctl to figure device node of the system console. tty: add 'active' sysfs attribute to tty0 and console device drivers: serial: apbuart: Handle OF failures gracefully Serial: Avoid unbalanced IRQ wake disable during resume tty: fix typos/errors in tty_driver.h comments pch_uart : fix warnings for 64bit compile 8250: fix uninitialized FIFOs ip2: fix compiler warning on ip2main_pci_tbl specialix: fix compiler warning on specialix_pci_tbl rocket: fix compiler warning on rocket_pci_ids 8250: add a UPIO_DWAPB32 for 32 bit accesses 8250: use container_of() instead of casting serial: omap-serial: Add support for kernel debugger serial: fix pch_uart kconfig & build drivers: char: hvc: add arm JTAG DCC console support RS485 documentation: add 16C950 UART description serial: ifx6x60: fix memory leak serial: ifx6x60: free IRQ on error Serial: EG20T: add PCH_UART driver ... Fixed up conflicts in drivers/serial/apbuart.c with evil merge that makes the code look fairly sane (unlike either side).		2011-01-07 14:39:20 -08:00
..
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
hpux	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
include/asm	TTY: Add tty ioctl to figure device node of the system console.	2010-12-16 16:18:28 -08:00
kernel	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
lib	parisc: add strict copy size checks (v2)	2010-03-06 22:54:09 +00:00
math-emu	parisc: change to new flag variable	2010-10-21 21:07:47 -04:00
mm	parisc: fix wrong page aligned size calculation in ioremapping code	2010-08-12 08:43:29 -07:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defpalo.conf	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
Kconfig.debug	parisc: add strict copy size checks (v2)	2010-03-06 22:54:09 +00:00
Makefile	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
nm	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00