Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)
commit0a1340c185734a57fbf4775927966ad4a1347b02
treed9ed8f0dd809a7c542a3356601125ea5b5aaa804
parentaf18ddb8864b096e3ed4732e2d4b21c956dcfe3a
parent29454dde27d8e340bb1987bad9aa504af7081eba
Merge git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/linux/kernel.h
CREDITS
MAINTAINERS
fs/Kconfig
fs/Makefile
include/linux/fs.h
include/linux/kernel.h
kernel/printk.c
mm/filemap.c
mm/readahead.c