diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 00:57:09 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 00:57:09 +0100 |
commit | 2d9819e3473f3e2200a4942760fa1f3d41043b99 (patch) | |
tree | 02999d88756715d7c3cd23d4e20c6627472e69da /drivers/mmc/wbsd.c | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | ieee1394: sbp2: fix probing of some DVD-ROM/RWs (diff) | |
download | linux-2d9819e3473f3e2200a4942760fa1f3d41043b99.tar.xz linux-2d9819e3473f3e2200a4942760fa1f3d41043b99.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: sbp2: fix probing of some DVD-ROM/RWs
Diffstat (limited to 'drivers/mmc/wbsd.c')
0 files changed, 0 insertions, 0 deletions