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)
* '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


Trivial merge