renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
Code
a0a4194c94
linux-next/drivers/input/touchscreen
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
88pm860x-ts.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ad7877.c Input: ad7877 - convert to dev_pm_ops 2011-01-20 22:54:43 -08:00
ad7879-i2c.c Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP 2011-10-06 19:43:05 -07:00
ad7879-spi.c Input: ad7879 - convert SPI to dev_pm_ops 2011-01-20 22:54:49 -08:00
ad7879.c Input: ad7879 - fix deficient device disable 2011-08-02 22:17:44 -07:00
ad7879.h Input: ad7879 - add open and close methods 2010-07-03 13:13:14 -07:00
ads7846.c Input: ads7846 - cleanup GPIO initialization 2011-06-27 13:08:05 -07:00
atmel_mxt_ts.c Input: atmel_mxt_ts - use snprintf for sysfs attribute show method 2011-10-06 19:41:52 -07:00
atmel_tsadcc.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
atmel-wm97xx.c Input: wm97xx - remove redundant define 2011-07-04 19:31:28 -07:00
bu21013_ts.c Input: bu21013_ts - added regulator support 2011-01-17 20:49:16 -08:00
cy8ctmg110_ts.c Input: cy8ctmg110_ts - set reset_pin and irq_pin from platform data 2011-07-18 17:10:27 -07:00
da9034-ts.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dynapro.c Input: add driver for Dynapro serial touchscreen 2009-10-26 11:01:30 -07:00
eeti_ts.c Input: eeti_ts - convert to dev_pm_ops 2011-01-06 23:02:57 -08:00
elo.c Input: elo - switch to using dev_xxx() when printing messages 2010-01-06 23:54:40 -08:00
fujitsu_ts.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
gunze.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
h3600_ts_input.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
hampshire.c Input: add driver for hampshire serial touchscreens 2010-04-13 23:27:41 -07:00
hp680_ts_input.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
htcpen.c Input: add HTC Shift Touchscreen Driver 2008-06-02 00:38:35 -04:00
inexio.c Input: Add driver for iNexio serial touchscreen. 2008-06-30 09:37:32 -04:00
intel-mid-touch.c Input: intel-mid-touch - remove pointless checking for variable 'found' 2011-07-18 17:10:41 -07:00
jornada720_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
Kconfig Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
lpc32xx_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
mainstone-wm97xx.c Input: wm97xx - remove redundant define 2011-07-04 19:31:28 -07:00
Makefile Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
max11801_ts.c Input: max11801_ts - correct license statement 2011-08-20 14:39:53 -07:00
mc13783_ts.c input: Convert mc13783-ts to mc13xxx API 2011-10-24 14:09:12 +02:00
mcs5000_ts.c Input: mcs5000_ts - convert to dev_pm_ops 2011-01-06 23:03:03 -08:00
migor_ts.c Input: migor_ts - convert to dev_pm_ops 2011-01-06 23:03:07 -08:00
mk712.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
mtouch.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
pcap_ts.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
penmount.c Input: penmount - simplify unregister procedure 2011-09-20 22:46:31 -07:00
s3c2410_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
st1232.c Input: add ST1232 touchscreen controller driver 2010-12-15 23:40:13 -08:00
stmpe-ts.c Input: stmpe-ts - return -ENOMEM when memory allocation fails 2010-09-05 12:09:12 -07:00
tnetv107x-ts.c Input: tnetv107x-ts - add missing include of linux/module.h 2011-08-21 12:49:41 -07:00
touchit213.c Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen 2008-07-07 12:00:30 -04:00
touchright.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
touchwin.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
tps6507x-ts.c input/tps6507x-ts: use system_wq instead of dedicated workqueue 2011-01-26 12:12:50 +01:00
tsc40.c Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
tsc2005.c Input: tsc2005 - fix locking issue 2011-03-23 23:50:36 -07:00
tsc2007.c Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
ucb1400_ts.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usbtouchscreen.c Input: usbtouchscreen - add support for LG Flatron T1710B 2010-11-22 12:01:13 -08:00
w90p910_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
wacom_w8001.c Merge branch 'next' into for-linus 2011-10-26 21:46:20 -07:00
wm97xx-core.c Fix common misspellings 2011-03-31 11:26:23 -03:00
wm831x-ts.c Input: wm831x-ts - move BTN_TOUCH reporting to data transfer 2011-04-27 23:12:22 -07:00
wm9705.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
wm9712.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
wm9713.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
zylonite-wm97xx.c Input: wm97xx - remove redundant define 2011-07-04 19:31:28 -07:00