From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 May 2008 17:12:48 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.26-rc4~97
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c110a2bd82676a8f124cf4dfc39339fd366f0e59;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: prevent userspace from accessing shut down devices
  ieee1394: sbp2: use correct size of command descriptor block
---

c110a2bd82676a8f124cf4dfc39339fd366f0e59