linux-sg2042/include/linux/i2c
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
..
adp5588.h Input: adp5588-keys - unify common header defines 2010-11-03 10:44:20 -07:00
adp8860.h backlight: adp8860: add support for ADP8861 & ADP8863 2010-05-26 13:08:33 +01:00
adp8870.h backlight: new driver for the ADP8870 backlight devices 2011-06-15 20:03:59 -07:00
ads1015.h hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
apds990x.h drivers/misc: driver for APDS990X ALS and proximity sensors 2010-10-26 16:52:14 -07:00
at24.h
atmel_mxt_ts.h Input: atmel_mxt_ts - allow board code to specify IRQ flags 2011-02-21 01:02:34 -08:00
bh1770glc.h drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor 2010-10-26 16:52:14 -07:00
dm355evm_msp.h
ds620.h hwmon: Support for Dallas Semiconductor DS620 2011-01-09 09:10:10 -08:00
i2c-sh_mobile.h i2c: i2c-sh_mobile bus speed platform data V2 2011-05-11 07:08:13 +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
max6639.h hwmon: Driver for Maxim MAX6639 2011-03-14 22:36:24 -07:00
mcs.h Input: mcs_touchkey - add support for suspend/resume 2011-02-23 21:43:31 -08:00
mpr121_touchkey.h Input: add driver FSL MPR121 capacitive touch sensor 2011-05-12 08:28:58 -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
pmbus.h hwmon: PMBus device driver 2011-03-14 22:36:26 -07:00
pxa-i2c.h ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
s6000.h i2c: xtensa s6000 i2c driver 2009-04-07 10:23:34 +01:00
sx150x.h gpio: sx150x: correct and refine reset-on-probe behavior 2010-09-09 18:57:24 -07:00
tps65010.h mfd: Allow configuration of VDCDC2 for tps65010 2009-12-13 19:21:36 +01:00
tsc2007.h Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
twl.h ASoC: twl6040: Configure ramp step based on platform 2011-07-04 19:36:29 +03:00
twl4030-madc.h mfd: Turn on the twl4030-madc MADC clock 2011-10-24 14:09:10 +02:00