Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Fri, 31 Mar 2006 20:34:58 +0000 (15:34 -0500)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 31 Mar 2006 20:34:58 +0000 (15:34 -0500)
commit86579dd06deecfa6ac88d5e84e4d63c397cd6f6d
treeb4475d3ccde53015ad84a06e4e55e64591171b75
parent7ea9ea832212c4a755650f7c7cc1ff0b63292a41
parenta0f067802576d4eb4c65d40b8ee7d6ea3c81dd61
Merge branch 'master'
Documentation/ioctl-number.txt
fs/Kconfig
fs/Makefile
include/linux/fs.h
include/linux/kernel.h
kernel/printk.c
mm/filemap.c
mm/readahead.c