projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a61f17 038b0a6)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 4 Oct 2006 16:59:57 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 4 Oct 2006 16:59:57 +0000 (09:59 -0700)
commitfefd26b3b8597a11a422d950c0d4424ff33a70ad
tree6794a36072635e71e5b33aec47c616bafdca65c1tree | snapshot
parent4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1commit | diff
parent038b0a6d8d32db934bba6a24e74e76e4e327a94fcommit | diff
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.
mm/slab.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;