From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Apr 2010 19:30:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: upstream/snapshot3+hdmi~14805
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0