Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 22:15:01 +0000 (14:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 22:15:01 +0000 (14:15 -0800)
commit88703f27758211fdda9bbbdf837330b27479e2b9
treeb6669be424d4083b3660a082d9bece58797d32c9
parentf242bbc598b96f58ca4caf416cabe3ac01e8b2ab
parentc7caf4d4c56aee40b995f5858ccf1c814f3d2da2
Merge branch 'staging-linus' of git://git./linux/kernel/git/gregkh/staging

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8712u: Add new USB ID
  staging: tidspbridge: request dmtimer clocks on init
  staging: tidspbridge: include module.h by default