commit 486b4ce13221aa6cd0cbc9fff6993f444d8a52b5
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue May 29 13:45:38 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue May 29 13:45:38 2007 -0700
tree ca903d6f4213556a82f2268eeeac1fd01d80cd4a
parent 358a9afc35d550db4f67b1c8336f5326244ceeda
parent 350958f984268dcf0f087aac78c5b9fe2846aeff

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:
  firewire: fix return code
  firewire: prefix modules with firewire- instead of fw-
  firewire: Add missing byteswapping for receive DMA programs.
  ieee1394: raw1394: Fix async send
  ieee1394: eth1394: bring back a parent device
  ieee1394: eth1394: handle tlabel exhaustion
  ieee1394: eth1394: remove bogus netif_wake_queue
  ieee1394: sbp2: include workqueue.h