kernel-fxtec-pro1x/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
adp8860.h
adp8870.h
ads1015.h
apds990x.h
at24.h
atmel_mxt_ts.h
bh1770glc.h
dm355evm_msp.h
ds620.h
i2c-sh_mobile.h
lm8323.h
ltc4245.h
max732x.h
max6639.h
mcs.h
mpr121_touchkey.h
pca953x.h
pca954x.h
pcf857x.h
pmbus.h
pxa-i2c.h
s6000.h
sx150x.h
tps65010.h
tsc2007.h Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
twl.h
twl4030-madc.h mfd: Turn on the twl4030-madc MADC clock 2011-10-24 14:09:10 +02:00