• Linus Torvalds's avatar
    Merge branch 'davinci-for-linus' of... · aed886ce
    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: (69 commits)
      davinci: Initial support for Neuros OSD2 platform.
      davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
      davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
      DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
      DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
      davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
      davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
      davinci: DA850/OMAP-L138 EVM: register for cpuidle support
      davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
      davinci: add CPU idle driver
      davinci: DA8XX/OMAP-L1XX: fix compiler warning
      davinci: DA850/OMAP-L138: eliminate static function declaration
      davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
      davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
      davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
      davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
      davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
      davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
      davinci: DA830/OMAP-L137 EVM: fix warning with default config
      davinci: Add NAND support for DA830/OMAP-L137 EVM platform
      ...
    aed886ce
asp.h 2.22 KB