]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit79215e29b1b7cf30dc5319a0904b84c80642679d
tree6794a36072635e71e5b33aec47c616bafdca65c1
parent9de54c8699660a91380c4737d50c019de7226ff8
parent77c9e371d6e36e70bb45ea577ef7d0bdd20b3832
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.
mm/slab.c