From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 12 Dec 2006 15:45:48 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.20-rc1~146^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11c302c14d8ddc47504bd3b650bc9e8da7c717b7;p=linux-2.6

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:
  JFS: Fix conflicting superblock flags
---

11c302c14d8ddc47504bd3b650bc9e8da7c717b7