Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
Linus Torvalds [Wed, 4 Oct 2006 16:59:57 +0000 (09:59 -0700)]
* 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.

1  2 
mm/slab.c

diff --cc mm/slab.c
Simple merge