diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /drivers/block/pktcdvd.c | |
parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'drivers/block/pktcdvd.c')
0 files changed, 0 insertions, 0 deletions