Linus Torvalds 6f3a28f7d1 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial ... * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: (21 commits) [SERIAL] add PNP IDs for FPI based touchscreens [SERIAL] Magic SysRq SAK does nothing on serial consoles [SERIAL] tickle NMI watchdog on serial output. [SERIAL] Fix oops when removing suspended serial port [SERIAL] Fix resume handling bug [SERIAL] Remove wrong asm/serial.h inclusions [SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c [SERIAL] OMAP1510 serial fix for 115200 baud [SERIAL] returning proper error from serial core driver [SERIAL] Make uart_line_info() correctly tell MMIO from I/O port [SERIAL] suspend/resume handlers don't have level arg anymore [SERIAL] 8250 resourse management fixes [SERIAL] serial_cs: Add quirk for brainboxes 2-port RS232 card [SERIAL] serial_cs: handle Nokia multi->single port bodge via config quirk [SERIAL] serial_cs: add configuration quirk [SERIAL] serial_cs: Convert Oxford 950 / Possio GCC wakeup quirk [SERIAL] serial_cs: convert IBM post-init handling to a quirk [SERIAL] serial_cs: allow wildcarded quirks [SERIAL] serial_cs: convert multi-port table to quirk table [SERIAL] serial_cs: Use clean up multiport card detection ...		2006-10-03 09:13:29 -07:00
..
arc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
au1000	[PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem)	2006-09-29 09:18:15 -07:00
basler/excite	[MIPS] Remove excite_flash.c	2006-10-01 23:16:59 +01:00
boot	Add .gitignore files for MIPS.	2005-11-07 18:05:37 +00:00
cobalt	[SERIAL] Remove wrong asm/serial.h inclusions	2006-10-01 17:09:16 +01:00
configs	[MIPS] lockdep: update defconfigs	2006-10-01 23:16:57 +01:00
ddb5xxx	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
dec	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
emma2rh	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
gt64120	[PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem)	2006-09-29 09:18:15 -07:00
ite-boards	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
jazz	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
jmr3927	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
kernel	[PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers	2006-10-03 08:03:40 -07:00
lasat	[SERIAL] Remove wrong asm/serial.h inclusions	2006-10-01 17:09:16 +01:00
lib	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
lib-32	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
lib-64	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
math-emu	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mips-boards	[MIPS] Atlas: update interrupt handling	2006-09-27 13:37:42 +01:00
mm	[MIPS] Stacktrace build-fix and improvement	2006-10-01 23:16:58 +01:00
momentum	[PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem)	2006-09-29 09:18:15 -07:00
oprofile	[MIPS] Oprofile: Fix build failure due to warning and -Werror.	2006-07-13 21:26:09 +01:00
pci	[MIPS] Remove EV96100 as previously announced.	2006-09-27 13:37:55 +01:00
philips/pnx8550	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
pmc-sierra	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
qemu	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
sgi-ip22	[PATCH] replace cad_pid by a struct pid	2006-10-02 07:57:25 -07:00
sgi-ip27	[PATCH] kill wall_jiffies	2006-10-01 00:39:27 -07:00
sgi-ip32	[PATCH] replace cad_pid by a struct pid	2006-10-02 07:57:25 -07:00
sibyte	[MIPS] Fix 32-bit kernel by replacing 64-bit-only code.	2006-09-27 13:37:35 +01:00
sni	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
tx4927	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
tx4938	[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.	2006-07-13 21:26:17 +01:00
vr41xx	[MIPS] vr41xx: Update workpad setup function	2006-07-13 21:26:21 +01:00
defconfig	[MIPS] lockdep: update defconfigs	2006-10-01 23:16:57 +01:00
Kconfig	[MIPS] QEMU: Add support for little endian mips	2006-10-01 23:16:58 +01:00
Kconfig.debug	[MIPS] TRACE_IRQFLAGS_SUPPORT support.	2006-07-13 21:26:09 +01:00
Makefile	[MIPS] Remove EV96100 as previously announced.	2006-09-27 13:37:55 +01:00