From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jan 2010 18:46:27 +0000 (-0800)
Subject: Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman... 
X-Git-Tag: v2.6.33-rc4~81
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b1c0ec8966fa79891b796f58bf2bda1026ca5566;p=~shefty%2Frdma-dev.git

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
---

b1c0ec8966fa79891b796f58bf2bda1026ca5566