summaryrefslogtreecommitdiffstats
path: root/fs/ufs/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-24 07:21:29 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-24 07:21:29 +0100
commitf52ee1410d563cd409b08822492273a5bc235821 (patch)
tree18694453f85c25cf7ffea2d9111067451cbaed0b /fs/ufs/inode.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific code (diff)
downloadlinux-f52ee1410d563cd409b08822492273a5bc235821.tar.xz
linux-f52ee1410d563cd409b08822492273a5bc235821.zip
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'fs/ufs/inode.c')
0 files changed, 0 insertions, 0 deletions