Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

* 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (138 commits)
  firewire: Convert OHCI driver to use standard goto unwinding for error handling.
  firewire: Always use parens with sizeof.
  firewire: Drop single buffer request support.
  firewire: Add a comment to describe why we split the sg list.
  firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in queuecommand.
  firewire: Handle the last few DMA mapping error cases.
  firewire: Allocate scsi_host up front and allocate the sbp2_device as hostdata.
  firewire: Provide module aliase for backwards compatibility.
  firewire: Add to fw-core-y instead of assigning fw-core-objs in Makefile.
  firewire: Break out shared IEEE1394 constant to separate header file.
  firewire: Use linux/*.h instead of asm/*.h header files.
  firewire: Uppercase most macro names.
  firewire: Coding style cleanup: no spaces after function names.
  firewire: Convert card_rwsem to a regular mutex.
  firewire: Clean up comment style.
  firewire: Use lib/ implementation of CRC ITU-T.
  CRC ITU-T V.41
  firewire: Rename fw-device-cdev.c to fw-cdev.c and move header to include/linux.
  firewire: Future proof the iso ioctls by adding a handle for the iso context.
  firewire: Add read/write and size annotations to IOC numbers.
  ...

Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/ieee1394/Kconfig
index f21426ad2faaf1d963af5afd7a95bcb2e63d56fc,c668538201bbfa4980d2f35a7133b439e4283904..8012b3b0ce75b83c23ae81f872fadb645167e3f1
--- 1/drivers/ieee1394/Kconfig
--- 2/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@@ -1,6 -1,9 +1,8 @@@
 -# -*- shell-script -*-
 -
  menu "IEEE 1394 (FireWire) support"
 +      depends on PCI || BROKEN
  
+ source "drivers/firewire/Kconfig"
+ 
  config IEEE1394
        tristate "IEEE 1394 (FireWire) support"
        depends on PCI || BROKEN

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge