]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 19:38:34 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 19:38:34 +0000 (12:38 -0700)
commit3f43aea4fc65f09f2bb1bcb13ff97916e1b78e75
treeedfd028285e21ba549d047c0caa4ffe523272f94
parentbdab8e8d66447c383ec21c9d2478147304b1e4f1
parentb5628c55d559d6b580332a3cdc4c4966ca1a3796
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
fs/exec.c
kernel/kmod.c