1. 26 Oct, 2010 38 commits
  2. 25 Oct, 2010 2 commits
    • Linus Torvalds's avatar
      Merge branch 'davinci-for-linus' of... · 72e58063
      Linus Torvalds authored
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
        davinci: fix remaining board support after io_pgoffst removal
        davinci: mityomapl138: make file local data static
        arm/davinci: remove duplicated include
        davinci: Initial support for Omapl138-Hawkboard
        davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
        davinci: add tnetv107x touchscreen platform device
        input: add driver for tnetv107x touchscreen controller
        davinci: add keypad config for tnetv107x evm board
        davinci: add tnetv107x keypad platform device
        input: add driver for tnetv107x on-chip keypad controller
        net: davinci_emac: cleanup unused cpdma code
        net: davinci_emac: switch to new cpdma layer
        net: davinci_emac: separate out cpdma code
        net: davinci_emac: cleanup unused mdio emac code
        omap: cleanup unused davinci mdio arch code
        davinci: cleanup mdio arch code and switch to phy_id
        net: davinci_emac: switch to new mdio
        omap: add mdio platform devices
        davinci: add mdio platform devices
        net: davinci_emac: separate out davinci mdio
        ...
      
      Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
      added next to each other - one from the davinci merge, one from the
      input merge)
      72e58063
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 57c155d5
      Linus Torvalds authored
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Remove inode->i_count manipulation in exofs_new_inode
        fs/exofs: typo fix of faild to failed
        exofs: Set i_mapping->backing_dev_info anyway
        exofs: Cleaup read path in regard with read_for_write
      57c155d5