diff options
| author |   Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 15:57:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 15:57:09 -0800 |
| commit | 2d9819e3473f3e2200a4942760fa1f3d41043b99 (patch) | |
| tree | 02999d88756715d7c3cd23d4e20c6627472e69da /include/linux | |
| 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) | |
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 'include/linux')
0 files changed, 0 insertions, 0 deletions