From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 11 Sep 2005 17:14:54 +0000 (-0700)
Subject: Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
X-Git-Tag: v2.6.14-rc1~116
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32983696a48a6c41d99f3eca82ba7510a552d843;p=pandora-kernel.git

Merge branch 'for-linus' from /.../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>
---

32983696a48a6c41d99f3eca82ba7510a552d843
Reading git-diff-tree failed