1. 04 11月, 2011 1 次提交
    • L
      Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 · a0a4194c
      Linus Torvalds 提交于
      * '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
      a0a4194c
  2. 03 11月, 2011 39 次提交