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 /init/Makefile | |
| parent | 40e38d30432a749b68d4c6e2038764ed1d3c846e (diff) | |
| parent | 1a74bc68e4c0534d150e6454b45a70dab831fa32 (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 'init/Makefile')
0 files changed, 0 insertions, 0 deletions