Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
commitc110a2bd82676a8f124cf4dfc39339fd366f0e59
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 17:12:48 +0000 (20 10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 17:12:48 +0000 (20 10:12 -0700)
tree3637991fd8b21c22b5083546f67132dbe2dda5a4
parent81b2dbcad86732ffc02bad87aa25c4651199fc77
parent551f4cb9de716ffcdaf968c99a450c22ff12e8c3
Merge branch 'for-linus' of git://git./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