tree 1236762b06beb3565671adc5d554ae2651cd661f
parent 547679087bc60277d11b11631d826895762c4505
parent c0e4077c946104e5d8a62f835dcdca5c79c8af7d
author Linus Torvalds <torvalds@g5.osdl.org> 1143600483 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143600483 -0800

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394:
  ohci1394: cleanup the "Unexpected PCI resource length" warning.
  sbp2: misc debug logging cleanups
  sbp2: proper treatment of DID_OK
  ieee1394: set read permission for parameter disable_irm
  sbp2: check for ARM failure
  ohci1394: clean up asynchronous and physical request filters programming
  ieee1394: remove amdtp remains from ieee1394_core.h
  ieee1394: remove devfs support
  Signed-off-by: Jody McIntyre <scjody@modernduck.com>
  sbp2: prevent unloading of 1394 low-level driver