tree 3637991fd8b21c22b5083546f67132dbe2dda5a4
parent 81b2dbcad86732ffc02bad87aa25c4651199fc77
parent 551f4cb9de716ffcdaf968c99a450c22ff12e8c3
author Linus Torvalds <torvalds@linux-foundation.org> 1211303568 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211303568 -0700

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