0c51689491ded6
parent 00eef7bd01c7598d195699983c5290d901df19ad
parent 19b3eecc21b65a24b0aae2684ca0c8e1b99ef802
author Linus Torvalds <torvalds@linux-foundation.org> 1271357780 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271357780 -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: cdev: change license of exported header files to MIT license
  firewire: cdev: comment fixlet
  firewire: cdev: iso packet documentation
  firewire: cdev: fix information leak
  firewire: cdev: require quadlet-aligned headers for transmit packets
  firewire: cdev: disallow receive packets without header
j