linux/arch/arm/mach-u300/include/mach
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
..
clkdev.h [ARM] 5474/1: U300 clocking framework 2009-04-28 22:44:12 +01:00
coh901318.h mach-u300: define a dummy filter function for coh901318 2011-03-14 14:05:17 +01:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma_channels.h ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300 2010-01-27 22:00:15 +00:00
entry-macro.S [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
gpio-u300.h ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
gpio.h ARM: mark empty gpio.h files empty 2011-10-29 13:05:46 +02:00
hardware.h [ARM] 5470/1: U300 register definitions 2009-04-28 22:44:05 +01:00
io.h [ARM] 5470/1: U300 register definitions 2009-04-28 22:44:05 +01:00
irqs.h Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
memory.h Merge branch 'depends/rmk/devel-stable' into next/cleanup 2011-10-08 21:07:42 +02:00
platform.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
syscon.h pinctrl: add a driver for the U300 pinmux 2011-10-13 12:57:45 +02:00
system.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
timex.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
u300-regs.h ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors 2011-06-09 10:15:06 +01:00
uncompress.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00