git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4856a7 118a906)
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)
* 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

1  2 
fs/exec.c patch | diff1 | diff2 | blob | history
kernel/kmod.c patch | diff1 | diff2 | blob | history

diff --cc fs/exec.c
Simple merge
diff --cc kernel/kmod.c
Simple merge
Pandora Kernel Repository