From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Oct 2008 19:38:34 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: v2.6.28-rc1~285
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9;p=linux-2.6-omap-h63xx.git

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
---

c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9