| commit | 88703f27758211fdda9bbbdf837330b27479e2b9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 15 14:15:01 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 15 14:15:01 2011 -0800 |
| tree | b6669be424d4083b3660a082d9bece58797d32c9 | |
| parent | f242bbc598b96f58ca4caf416cabe3ac01e8b2ab [diff] | |
| parent | c7caf4d4c56aee40b995f5858ccf1c814f3d2da2 [diff] |
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/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