| commit | b1c0ec8966fa79891b796f58bf2bda1026ca5566 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 06 10:46:27 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 06 10:46:27 2010 -0800 |
| tree | 0aa295389a570f2181438e67d4cb007c168f4214 | |
| parent | 642a74e7a411967ceea87d6ee720a436608696a0 [diff] | |
| parent | c92b29ec4a7a197199b8b937b909d80dc79d8e5b [diff] |
Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci * '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