original_kernel/drivers/input/touchscreen
Linus Torvalds 7cc4e87f91 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: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
Kconfig Merge branch 'pxa-palm' into pxa-machines 2008-10-07 19:07:22 +01:00
Makefile
ads7846.c Input: ads7846 - introduce .gpio_pendown to get pendown state 2008-09-17 17:33:37 +01:00
atmel_tsadcc.c
corgi_ts.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
elo.c
fujitsu_ts.c
gunze.c
h3600_ts_input.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
hp680_ts_input.c
htcpen.c
inexio.c
jornada720_ts.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2008-09-22 07:46:06 -07:00
mainstone-wm97xx.c removed unused #include <linux/version.h>'s 2008-08-23 12:14:12 -07:00
migor_ts.c input: migor_ts compile and detection fix 2008-08-11 20:17:54 +09:00
mk712.c
mtouch.c
penmount.c
touchit213.c
touchright.c
touchwin.c
ucb1400_ts.c [ARM] 5184/1: Split ucb1400_ts into core and touchscreen 2008-08-20 23:22:22 +01:00
usbtouchscreen.c
wm97xx-core.c Input: remove version.h from drivers that don't need it 2008-08-18 11:00:47 -04:00
wm9705.c Input: remove version.h from drivers that don't need it 2008-08-18 11:00:47 -04:00
wm9712.c Input: remove version.h from drivers that don't need it 2008-08-18 11:00:47 -04:00
wm9713.c Input: remove version.h from drivers that don't need it 2008-08-18 11:00:47 -04:00