From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Nov 2008 23:55:34 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.28-rc4~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6572a281cfd805dd54718597d6c33261b5be052b;p=linux-2.6-omap-h63xx.git

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:
  ieee1394: dv1394: fix possible deadlock in multithreaded clients
  ieee1394: raw1394: fix possible deadlock in multithreaded clients
  ieee1394: struct device - replace bus_id with dev_name(), dev_set_name()
  firewire: struct device - replace bus_id with dev_name(), dev_set_name()
---

6572a281cfd805dd54718597d6c33261b5be052b