summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 12:38:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 12:38:34 -0700
commitc8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch)
treeedfd028285e21ba549d047c0caa4ffe523272f94 /drivers/serial
parente4856a70cfc23266631a78e78277cf2b195babee (diff)
parent118a9069f06ff591d51a3133e242f0c256ba2db7 (diff)
downloadlinux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.gz
linux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.bz2
linux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.zip
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
Diffstat (limited to 'drivers/serial')
0 files changed, 0 insertions, 0 deletions