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
..
include/mach	Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:18:05 -07:00
board-mop500-pins.c
board-mop500-regulators.c
board-mop500-regulators.h
board-mop500-sdi.c
board-mop500-stuib.c
board-mop500-u8500uib.c
board-mop500-uib.c
board-mop500.c
board-mop500.h
board-u5500-sdi.c
board-u5500.c	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
cache-l2x0.c
clock.c
clock.h
cpu-db5500.c
cpu-db8500.c
cpu.c	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
devices-common.c
devices-common.h
devices-db5500.h
devices-db8500.c
devices-db8500.h
devices.c
dma-db5500.c
headsmp.S
hotplug.c
id.c
Kconfig
localtimer.c
Makefile
Makefile.boot
mbox-db5500.c
modem-irq-db5500.c
pins-db5500.h
pins-db8500.h
platsmp.c	Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:34:22 -07:00
ste-dma40-db5500.h
ste-dma40-db8500.h
timer.c
usb.c