| commit | 11c302c14d8ddc47504bd3b650bc9e8da7c717b7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Tue Dec 12 07:45:48 2006 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Tue Dec 12 07:45:48 2006 -0800 |
| tree | 71f39a71ed889df3f3f91420dd2074b134ed0e40 | |
| parent | 335302618f47b43e1204d24a3edb65a3e5bc8c03 [diff] | |
| parent | 36b12fb709d229f277efbbe710031d5a429b2412 [diff] |
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