tree 5f2d1add9f98995bf8c22cdfc6ade3e02869e1ac
parent b9d2252c1e44fa83a4e65fdc9eb93db6297c55af
parent a7ea67823af4a7e442e92064b0fab46603a588f6
author Linus Torvalds <torvalds@linux-foundation.org> 1216150753 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216150753 -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: don't respond to broadcast write requests
  firewire: clean up fw_card reference counting
  firewire: clean up some includes
  firewire: remove unused struct members
  firewire: implement broadcast_channel CSR for 1394a compliance
  ieee1394: dump mmapped iso buffers in core files
  ieee1394: raw1394: Push the BKL down into the driver ioctls
  ieee1394: video1394: reorder module init, prepare BKL removal
  ieee1394: reduce log noise about config ROM CRC errors