From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 29 May 2007 20:45:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.22-rc4~97
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486b4ce13221aa6cd0cbc9fff6993f444d8a52b5;p=linux-2.6

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
---

486b4ce13221aa6cd0cbc9fff6993f444d8a52b5