Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 2 Mar 2008 20:38:17 +0000 (12:38 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 2 Mar 2008 20:38:17 +0000 (12:38 -0800)
commit038f2f725503b55ab76cfd2645915a85594710fe
treedfed2103875ec09f4bb4e7031e6eb370f8095c58
parent8d07a67cface19ac07d7324f38bda7bbb06bbdb2
parent855c603d61ede7e2810217f15f0d574b4f29c891
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: fix crash in automatic module unloading
  firewire: potentially invalid pointers used in fw_card_bm_work
  firewire: fw-sbp2: better fix for NULL pointer dereference in scsi_remove_device