Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

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

diff --cc fs/jfs/inode.c
Simple merge

diff --cc fs/jfs/jfs_dmap.c
Simple merge

diff --cc fs/jfs/jfs_inode.h
Simple merge

diff --cc fs/jfs/namei.c
Simple merge