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>

diff --cc fs/jfs/acl.c
Simple merge

diff --cc fs/jfs/inode.c
Simple merge

diff --cc fs/jfs/jfs_acl.h
Simple merge

diff --cc fs/jfs/jfs_xattr.h
Simple merge

diff --cc fs/jfs/namei.c
Simple merge

diff --cc fs/jfs/xattr.c
Simple merge