Tony Lindgren 2533c2cfbf Merge branch 'fixes-gpio-to-irq' into fixes ... Conflicts: arch/arm/mach-omap1/board-htcherald.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/plat-omap/include/plat/gpio.h drivers/input/serio/ams_delta_serio.c		2012-03-29 10:16:04 -07:00
..
altera_ps2.c	Input: altera_ps2 - use of_match_ptr()	2012-03-16 23:34:00 -07:00
ambakmi.c	ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver	2012-03-16 23:32:35 +00:00
ams_delta_serio.c	Merge branch 'fixes-gpio-to-irq' into fixes	2012-03-29 10:16:04 -07:00
at32psif.c
ct82c710.c
gscps2.c
hil_mlc.c
hp_sdc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
hp_sdc_mlc.c
i8042-io.h
i8042-ip22io.h
i8042-jazzio.h
i8042-ppcio.h
i8042-snirm.h
i8042-sparcio.h
i8042-unicore32io.h
i8042-x86ia64io.h
i8042.c
i8042.h
Kconfig
libps2.c
maceps2.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
Makefile
parkbd.c
pcips2.c
ps2mult.c
q40kbd.c
rpckbd.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
sa1111ps2.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
serio.c
serio_raw.c
serport.c
xilinx_ps2.c