1
0
Fork 0
alistair23-linux/drivers/input/serio
Linus Torvalds 2cf4d4514d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
  MAINTAINERS: EB110ATX is not ebsa110
  MAINTAINERS: update Eric Miao's email address and status
  fb: add support of LCD display controller on pxa168/910 (base layer)
  [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
  [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
  [ARM] 5544/1: Trust PrimeCell resource sizes
  [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
  [ARM] pxa/sharpsl_pm: drop set_irq_type calls
  [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
  [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
  [ARM] sa1100: remove unused collie_pm.c
  [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
  [ARM] 5550/1: Add default configure file for w90p910 platform
  [ARM] 5549/1: Add clock api for w90p910 platform.
  [ARM] 5548/1: Add gpio api for w90p910 platform
  [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
  [ARM] Make ARM_VIC_NR depend on ARM_VIC
  [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
  ARM: OMAP4: SMP: Update defconfig for OMAP4430
  ARM: OMAP4: SMP: Enable SMP support for OMAP4430
  ...
2009-06-14 13:42:43 -07:00
..
Kconfig microblaze: Kconfig: Enable drivers for Microblaze 2009-05-21 15:56:04 +02:00
Makefile Input: add new serio driver for Xilinx XPS PS2 IP 2008-07-07 16:19:56 -04:00
ambakmi.c [ARM] 5544/1: Trust PrimeCell resource sizes 2009-06-11 15:36:56 +01:00
at32psif.c Input: at32psif - update MODULE_AUTHOR with new email 2008-04-24 13:25:18 -04:00
ct82c710.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
gscps2.c Input: struct device - replace bus_id with dev_name(), dev_set_name() 2009-01-29 23:00:44 -08:00
hil_mlc.c Input: HIL drivers - add MODULE_ALIAS() 2008-12-30 00:57:12 -08:00
hp_sdc.c drivers/input/serio/hp_sdc.c: fix crash when removing hp_sdc module 2009-04-21 13:41:49 -07:00
hp_sdc_mlc.c Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next 2008-07-21 00:55:14 -04:00
i8042-io.h powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks 2008-09-23 10:41:28 -05:00
i8042-ip22io.h Input: make i8042_platform_init return 'real' error code 2005-09-04 01:41:38 -05:00
i8042-jazzio.h Input: make i8042_platform_init return 'real' error code 2005-09-04 01:41:38 -05:00
i8042-ppcio.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
i8042-snirm.h Input: i8042 - add SNI RM support 2008-03-14 11:54:06 -04:00
i8042-sparcio.h sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07:00
i8042-x86ia64io.h Input: i8042 - add a DMI table for the i8042.reset option 2009-04-11 17:09:12 -07:00
i8042.c Input: i8042 - introduce a tougher reset 2009-04-11 17:09:12 -07:00
i8042.h Input: i8042 - add SNI RM support 2008-03-14 11:54:06 -04:00
libps2.c Input: libps2 - better handle bad scheduler decisions 2009-05-28 10:34:02 -07:00
maceps2.c define global BIT macro 2007-10-19 11:53:42 -07:00
parkbd.c [PARPORT] Remove unused 'irq' argument from parport irq functions 2007-10-23 19:53:16 -04:00
pcips2.c Input: struct device - replace bus_id with dev_name(), dev_set_name() 2008-10-30 09:29:05 -04:00
q40kbd.c Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next 2008-07-21 00:55:14 -04:00
rpckbd.c [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h 2009-03-25 10:21:35 +00:00
sa1111ps2.c Input: sa1111ps2 - use disable_irq_nosync() in irq handlers 2009-04-17 20:41:54 -07:00
serio.c Input: struct device - replace bus_id with dev_name(), dev_set_name() 2008-10-30 09:29:05 -04:00
serio_raw.c Rationalize fasync return values 2009-03-16 08:34:35 -06:00
serport.c tty: Ldisc revamp 2008-07-20 17:12:34 -07:00
xilinx_ps2.c Input: xilinx_ps2 - various cleanups 2008-10-27 22:23:32 -04:00