1. 13 Jan, 2009 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.o-hand.com/linux-mfd · b7437916
      Linus Torvalds authored
      * 'for-next' of git://git.o-hand.com/linux-mfd:
        mfd: Fix twl4030-core build
        mfd: Ensure sm501 GPIO pin mode is GPIO when configured
        mfd: dm355 evm MMC/SD card detection
        regulator: PCF50633 pmic driver
        input: PCF50633 input driver
        power_supply: PCF50633 battery charger driver
        rtc: PCF50633 rtc driver
        mfd: PCF50633 gpio support
        mfd: PCF50633 adc driver
        mfd: PCF50633 core driver
      b7437916
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 9219a3b9
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (37 commits)
        MIPS: Only write c0_framemask on CPUs which have this register.
        MIPS: Alchemy: new userspace suspend interface for development boards.
        MIPS: Alchemy: dbdma suspend/resume support.
        MIPS: Alchemy: Fix up PM code on Au1550/Au1200
        MIPS: Alchemy: move calc_clock function.
        MIPS: Alchemy: RTC counter clocksource / clockevent support.
        MIPS: make cp0 counter clocksource/event usable as fallback.
        MIPS: Alchemy: remove cpu_table.
        MIPS: Alchemy: remove get/set_au1x00_lcd_clock().
        MIPS: Print irq handler description
        MIPS: Alchemy: pb1200: update CPLD cascade irq handler.
        MIPS: Alchemy: update core interrupt code.
        MIPS: Alchemy: move commandline mangling out of common code
        MIPS: Alchemy: devboards: consolidate files
        MIPS: Alchemy: Move development board code to common subdirectory
        MIPS: Add Cavium OCTEON to arch/mips/Kconfig
        MIPS: Add defconfig for Cavium OCTEON.
        MIPS: Adjust the dma-common.c platform hooks.
        MIPS: Add Cavium OCTEON slot into proper tlb category.
        MIPS:  Compute branch returns for Cavium OCTEON specific branch instructions.
        ...
      9219a3b9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 23ead729
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
        ucc_geth: use correct UCCE macros
        net_dma: acquire/release dma channels on ifup/ifdown
        cxgb3: Keep LRO off if disabled when interface is down
        sfc: SFT9001: Fix condition for LNPGA power-off
        dccp ccid-3: Fix RFC reference
        smsc911x: register irq with device name, not driver name
        smsc911x: fix smsc911x_reg_read compiler warning
        forcedeth: napi schedule lock fix
        net: fix section mismatch warnings in dccp/ccids/lib/tfrc.c
        forcedeth: remove mgmt unit for mcp79 chipset
        qlge: Remove dynamic alloc of rx ring control blocks.
        qlge: Fix schedule while atomic issue.
        qlge: Remove support for device ID 8000.
        qlge: Get rid of split addresses in hardware control blocks.
        qlge: Get rid of volatile usage for shadow register.
        forcedeth: version bump and copyright
        forcedeth: xmit lock fix
        netdev: missing validate_address hooks
        netdev: add missing set_mac_address hook
        netdev: gianfar: add MII ioctl handler
        ...
      23ead729
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 54c26687
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Fix asm/signal.h for 32-bit.
        sparc: Eliminate PROMLIB_INTERNAL as it does nothing
        sparc: Kill exports of prom internal functions
        sparc64: move EXPORT_SYMBOL to the symbols definition
        sparc: move EXPORT_SYMBOL to the symbols definition
        sparc: Create a new file lib/ksyms.c and add export of all symbols defined in assembler in lib/ to this file.
        sparc: Most unaligned_64.c tweaks for branch tracer warnings.
        sparc: Fix sun4d_irq.c build.
        sparc: Update 32-bit defconfig.
        sparc64: fix warnings in psycho_common after ull conversion
      54c26687
  2. 12 Jan, 2009 36 commits