From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 29 Mar 2006 02:48:03 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
X-Git-Tag: v3.12-rc1~36988
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=224b148ef7c9a00642eb33dbdf62f2840bde974f;p=kernel%2Fkernel-generic.git

Merge branch 'for-linus' of /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
---

224b148ef7c9a00642eb33dbdf62f2840bde974f