From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Jan 2008 20:20:32 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.25-rc1~1238
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2d94dfc8c38edf63e91e48fd55c3a8822b6a9ced;p=linux-2.6-omap-h63xx.git

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

2d94dfc8c38edf63e91e48fd55c3a8822b6a9ced