Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2009 22:36:19 +0000 (15:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2009 22:36:19 +0000 (15:36 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: sbp2: provide fallback if mgt_ORB_timeout is missing
  ieee1394: add documentation entry to MAINTAINERS
  ieee1394: update URLs in debugging-via-ohci1394.txt

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge