diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 18:59:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 18:59:57 +0200 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /sound/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6 (diff) | |
| parent | Remove all inclusions of <linux/config.h> (diff) | |
| download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.xz linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.zip | |
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 'sound/Makefile')
0 files changed, 0 insertions, 0 deletions