Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 ... Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c		2010-08-16 18:42:58 +01:00
..
adp5588.h	Input: adp5588-keys - export unused GPIO pins	2010-07-26 01:17:41 -07:00
adp8860.h	backlight: adp8860: add support for ADP8861 & ADP8863	2010-05-26 13:08:33 +01:00
at24.h	memory_accessor: implement the new memory_accessor interface for I2C EEPROM	2009-04-02 19:04:50 -07:00
dm355evm_msp.h	mfd: dm355evm msp430 driver	2009-01-04 12:17:43 +01:00
lm8323.h	Input: introduce lm8323 keypad driver	2009-05-15 20:13:25 -07:00
ltc4245.h	hwmon: (ltc4245) Expose all GPIO pins as analog voltages	2010-08-14 21:08:49 +02:00
max732x.h	gpio: add interrupt handling capability to max732x	2010-05-27 09:12:41 -07:00
mcs.h	Input: mcs - Add MCS touchkey driver	2010-07-04 01:23:26 -07:00
pca953x.h	gpiolib: make names array and its values const	2010-05-27 09:12:41 -07:00
pca954x.h	i2c: I2C bus multiplexer driver pca954x	2010-08-11 18:21:03 +02:00
pcf857x.h
qt602240_ts.h	Input: Add ATMEL QT602240 touchscreen driver	2010-07-14 21:58:52 -07:00
s6000.h	i2c: xtensa s6000 i2c driver	2009-04-07 10:23:34 +01:00
sx150x.h	gpio: sx150x: add Semtech I2C sx150x gpio expander driver	2010-08-11 08:59:09 -07:00
tps65010.h	mfd: Allow configuration of VDCDC2 for tps65010	2009-12-13 19:21:36 +01:00
tsc2007.h
twl.h	ASoC: multi-component - ASoC Multi-Component Support	2010-08-12 14:00:00 +01:00