projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d34fb8 c68a65d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2009 17:02:36 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2009 17:02:36 +0000 (10:02 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: needs crc32_le
  jfs: Fix error handling in metapage_writepage()
  jfs: return f_fsid for statfs(2)
  jfs: remove xtLookupList()
  jfs: clean up a dangling comment

1  2 
fs/jfs/jfs_extent.c patch | diff1 | diff2 | blob | history
fs/jfs/jfs_xtree.c patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/jfs_extent.c
Simple merge
diff --cc fs/jfs/jfs_xtree.c
Simple merge
Domain: System / Kernel;