aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-11 10:14:54 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-11 10:14:54 -0700
commit32983696a48a6c41d99f3eca82ba7510a552d843 (patch)
treeab793556d6a9d2d4e0f366eed58e74b8e705cd8c /arch/sh/Makefile
parentce1289adeb67b5480f35cb257cbf6e9881153783 (diff)
parent1d15b10f95d4c4295a0f2288c7be7b6a005490da (diff)
downloadlinux-2.6.34-ux500-32983696a48a6c41d99f3eca82ba7510a552d843.tar.gz
Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
Clash due to new delete_inode behavior (the filesystem now needs to do the truncate_inode_pages() call itself). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh/Makefile')
0 files changed, 0 insertions, 0 deletions