]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9
treeedfd028285e21ba549d047c0caa4ffe523272f94tree | snapshot
parente4856a70cfc23266631a78e78277cf2b195babeecommit | diff
parent118a9069f06ff591d51a3133e242f0c256ba2db7commit | diff
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 diff1 | diff2 | blob | history
kernel/kmod.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.