1. 30 Jul, 2011 5 commits
    • Linus Torvalds's avatar
      Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 8f57be8e
      Linus Torvalds authored
      * 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        at91: add arch specific ioremap support
        at91: factorize sram init
        at91: move register clocks to soc generic init
        at91: move clock subsystem init to soc generic init
        at91: use structure to store the current soc
        at91: remove AT91_DBGU offset from dbgu register macro
        at91: factorize at91 interrupts init to soc
        at91: introduce commom AT91_BASE_SYS
      8f57be8e
    • Linus Torvalds's avatar
      Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · cb7dee8d
      Linus Torvalds authored
      * 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (21 commits)
        arm/dt: tegra devicetree support
        arm/versatile: Add device tree support
        dt/irq: add irq_domain_generate_simple() helper
        irq: add irq_domain translation infrastructure
        dmaengine: imx-sdma: add device tree probe support
        dmaengine: imx-sdma: sdma_get_firmware does not need to copy fw_name
        dmaengine: imx-sdma: use platform_device_id to identify sdma version
        mmc: sdhci-esdhc-imx: add device tree probe support
        mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host
        mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
        mmc: sdhci-esdhc-imx: do not reference platform data after probe
        mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5
        net/fec: add device tree probe support
        net: ibm_newemac: convert it to use of_get_phy_mode
        dt/net: add helper function of_get_phy_mode
        net/fec: gasket needs to be enabled for some i.mx
        serial/imx: add device tree probe support
        serial/imx: get rid of the uses of cpu_is_mx1()
        arm/dt: Add dtb make rule
        arm/dt: Add skeleton dtsi file
        ...
      cb7dee8d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 49267fc8
      Linus Torvalds authored
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        ARM: zynq: remove incorrectly deleted file
        ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
      49267fc8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog · 2313bcdc
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog: (25 commits)
        watchdog: WatchDog Timer Driver Core - Add minimum and max timeout
        watchdog: WatchDog Timer Driver Core - Add ioctl call
        watchdog: WatchDog Timer Driver Core - Add nowayout feature
        watchdog: WatchDog Timer Driver Core - Add Magic Close feature
        watchdog: WatchDog Timer Driver Core - Add WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT ioctl
        watchdog: WatchDog Timer Driver Core - Add WDIOC_SETOPTIONS ioctl
        watchdog: WatchDog Timer Driver Core - Add WDIOC_KEEPALIVE ioctl
        watchdog: WatchDog Timer Driver Core - Add basic ioctl functionality
        watchdog: WatchDog Timer Driver Core - Add basic framework
        watchdog: hpwdt: add next gen HP servers
        watchdog: it8712f_wdt.c: improve includes
        watchdog: at91sam9/wdt: move register header to drivers
        watchdog: Add Xilinx watchdog timer driver
        watchdog: remove empty pm-functions
        watchdog: sp805: Flush posted writes in enable/disable.
        watchdog: sp805: Don't write 0 to the load value register.
        watchdog: imx2_wdt: add device tree probe support
        watchdog: s3c2410: Add support for device tree based probe
        watchdog: mpcore_wdt: Add suspend/resume support.
        watchdog: mtx1-wdt: use dev_{err,info} instead of printk()
        ...
      2313bcdc
    • Linus Torvalds's avatar
      ext2: remove duplicate 'ext2_get_acl()' define · 59ed2bb2
      Linus Torvalds authored
      When commit 4e34e719 ("fs: take the ACL checks to common code")
      changed the xyz_check_acl() functions into the more natural
      xyz_get_acl() interface, we grew two copies of the
      
        #define ext2_get_acl	NULL
      
      define for the non-acl case.
      
      Remove the extra one.
      Reported-by: default avatarMarco Stornelli <marco.stornelli@gmail.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      59ed2bb2
  2. 28 Jul, 2011 35 commits