tree edfd028285e21ba549d047c0caa4ffe523272f94
parent e4856a70cfc23266631a78e78277cf2b195babee
parent 118a9069f06ff591d51a3133e242f0c256ba2db7
author Linus Torvalds <torvalds@linux-foundation.org> 1224185914 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224185914 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  module: remove CONFIG_KMOD in comment after #endif
  remove CONFIG_KMOD from fs
  remove CONFIG_KMOD from drivers

Manually fix conflict due to include cleanups in drivers/md/md.c