tree cbb8ab94e53deb22970094db374ab3494345ab3a
parent b47711bfbcd4eb77ca61ef0162487b20e023ae55
parent 5c5e32ceeb6b64496a1842d5d99e4ac8d20166c4
author Linus Torvalds <torvalds@linux-foundation.org> 1201292432 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1201292432 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  mount options: fix jfs
  JFS: simplify types to get rid of sparse warning
  JFS: FIx one more plain integer as NULL pointer warning
  JFS: Remove defconfig ptr comparison to 0
  JFS: use DIV_ROUND_UP where appropriate
  Remove unnecessary kmalloc casts in the jfs filesystem
  JFS is missing a memory barrier
  JFS: Make sure special inode data is written after journal is flushed
  JFS: clear PAGECACHE_TAG_DIRTY for no-write pages