Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 12 Dec 2006 15:45:48 +0000 (07:45 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 12 Dec 2006 15:45:48 +0000 (07:45 -0800)
commit11c302c14d8ddc47504bd3b650bc9e8da7c717b7
tree71f39a71ed889df3f3f91420dd2074b134ed0e40
parent335302618f47b43e1204d24a3edb65a3e5bc8c03
parent36b12fb709d229f277efbbe710031d5a429b2412
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: Fix conflicting superblock flags