diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 19:54:49 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 19:54:49 +0100 |
commit | 764e028e24d33f6e375d2a5df450c9d0180fbc00 (patch) | |
tree | 94c5c4a8f0b26a2d23af5f0340023533fa620010 /drivers/pps | |
parent | Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | Staging: ath6kl: remove empty files that mess with 'distclean' (diff) | |
download | linux-764e028e24d33f6e375d2a5df450c9d0180fbc00.tar.xz linux-764e028e24d33f6e375d2a5df450c9d0180fbc00.zip |
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6:
Staging: ath6kl: remove empty files that mess with 'distclean'
staging: ath6kl: Fixing the driver to use modified mmc_host structure
Staging: solo6x10: fix build problem
Diffstat (limited to 'drivers/pps')
0 files changed, 0 insertions, 0 deletions