| commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 16 12:38:34 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 16 12:38:34 2008 -0700 |
| tree | edfd028285e21ba549d047c0caa4ffe523272f94 | |
| parent | e4856a70cfc23266631a78e78277cf2b195babee [diff] | |
| parent | 118a9069f06ff591d51a3133e242f0c256ba2db7 [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