]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit40e90744567dfedcdcf289a48f72bae8a1989079
tree71f39a71ed889df3f3f91420dd2074b134ed0e40
parent62ffcdfdf1cf86b15bd7822d1df7ba632274f3f5
parent5084f8a7f9d3b08f07e7b60832e041bb6147cef3
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