tree 71f39a71ed889df3f3f91420dd2074b134ed0e40
parent 335302618f47b43e1204d24a3edb65a3e5bc8c03
parent 36b12fb709d229f277efbbe710031d5a429b2412
author Linus Torvalds <torvalds@woody.osdl.org> 1165938348 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1165938348 -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:
  JFS: Fix conflicting superblock flags