tree 6794a36072635e71e5b33aec47c616bafdca65c1
parent 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1
parent 038b0a6d8d32db934bba6a24e74e76e4e327a94f
author Linus Torvalds <torvalds@g5.osdl.org> 1159981197 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159981197 -0700

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.