From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Jun 2008 19:20:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.26-rc9~94
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b20715f3f83141ab5a2bb14b844b7c3c8bcf1aa;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

0b20715f3f83141ab5a2bb14b844b7c3c8bcf1aa