]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
projects / mv-sheeva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 642a74e c92b29e)
Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 18:46:27 +0000 (10:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 18:46:27 +0000 (10:46 -0800)
* 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  DaVinci: DM365: Add the device_enable for the DaVinci Keyscan
  davinci: enable ARCH_HAS_HOLES_MEMORYMODEL for DaVinci
  davinci: da8xx/omap-l1: mark RTC as a wakeup source
  davinci: cp_intc: provide set_wake function
  Davinci VPFE Capture: Take i2c adapter id through platform data


Trivial merge
Linux for Marvell Sheeva based platforms