From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Oct 2009 22:36:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=v2.6.32-rc4-kbuild-00149-ga3ccf63;p=linux-beck.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: sbp2: provide fallback if mgt_ORB_timeout is missing
  ieee1394: add documentation entry to MAINTAINERS
  ieee1394: update URLs in debugging-via-ohci1394.txt
---

a3ccf63ee643ef243cbf8918da8b3f9238f10029