diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 21:38:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 21:38:34 +0200 |
| commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
| tree | edfd028285e21ba549d047c0caa4ffe523272f94 /fs/timerfd.c | |
| parent | Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | module: remove CONFIG_KMOD in comment after #endif (diff) | |
| download | linux-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.xz 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 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions