projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce1289a 1d15b10)
Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 17:14:54 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 17:14:54 +0000 (10:14 -0700)
commit32983696a48a6c41d99f3eca82ba7510a552d843
treeab793556d6a9d2d4e0f366eed58e74b8e705cd8ctree | snapshot
parentce1289adeb67b5480f35cb257cbf6e9881153783commit | diff
parent1d15b10f95d4c4295a0f2288c7be7b6a005490dacommit | diff
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>
fs/jfs/inode.c diff1 | diff2 | blob | history
John Crispins staging tree