linux/arch/arm/mach-omap2
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
..
2011-03-09 18:44:28 -07:00
2010-02-15 09:27:05 -08:00
2011-06-29 01:11:37 -07:00
2011-05-12 02:52:06 -07:00
2011-05-12 02:52:06 -07:00
2011-03-29 14:47:57 +02:00
2010-07-05 16:31:36 +03:00
2011-03-31 11:26:23 -03:00
2011-08-10 04:53:28 -07:00
2011-09-14 17:23:19 -06:00
2011-07-04 15:08:06 +03:00
2011-01-27 16:39:40 -08:00
2010-12-21 20:01:54 -07:00
2010-12-17 15:13:44 -08:00
2011-05-12 02:52:06 -07:00
2011-01-06 19:58:28 -08:00