| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 4 Oct 2006 16:59:57 +0000 (4 09:59 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 4 Oct 2006 16:59:57 +0000 (4 09:59 -0700) | ||
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 | treesnapshot (tar.gz zip) |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 | commitdiff |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f | commitdiff |
Merge /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.
* 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.
| mm/slab.c | diff1 | diff2 | blobhistory |