projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a486b0a c7f2e1f)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:30:07 +0000 (12:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:30:07 +0000 (12:30 -0700)
commit9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0
tree1270f24f89f10d832e879dd1352ef0209dd3aebetree | snapshot
parenta486b0af797e19ff79c6943cc8986111f2569fe8commit | diff
parentc7f2e1f0ac142a657a1de00d404e1c8345b20598commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: add jfs specific ->setattr call
  jfs: fix diAllocExt error in resizing filesystem
  jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g
fs/jfs/inode.c diff1 | diff2 | blob | history
fs/jfs/jfs_dmap.c diff1 | diff2 | blob | history
fs/jfs/jfs_inode.h diff1 | diff2 | blob | history
fs/jfs/namei.c diff1 | diff2 | blob | history
Domain: System / Kernel;