tree f6f4eb4b1d7a4b3b65b2ae58c993bc456facfb45
parent 77a189c28b44035ff1b6841df32c43af8a9e8399
parent 9499fe2b340d19ef55c349de794db9d917e7403f
author Linus Torvalds <torvalds@linux-foundation.org> 1213990870 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213990870 -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:
  ieee1394: Kconfig menu touch-up
  firewire: Kconfig menu touch-up
  firewire: deadline for PHY config transmission
  firewire: fw-ohci: unify printk prefixes
  firewire: fill_bus_reset_event needs lock protection
  firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID
  firewire: fw-ohci: disable PHY packet reception into AR context
  firewire: fw-ohci: use of uninitialized data in AR handler
  firewire: don't panic on invalid AR request buffer