Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:20:11 +0000 (12:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:20:11 +0000 (12:20 -0700)
commit0b20715f3f83141ab5a2bb14b844b7c3c8bcf1aa
treeea8c58388434288f87459c642e4437b0f741e0d6
parent747606464bc1eb1a2c3588b3b06ef7538f12deac
parent0e3e2eabf4fbc0162e1f1eb4fd90cb3e9513a554
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: fw-sbp2: fix parsing of logical unit directories