From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Aug 2010 15:19:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.36-rc3~1
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=994b384a040d6f8afc3595c1a99c1b784e0cce49;hp=994b384a040d6f8afc3595c1a99c1b784e0cce49;p=net-next-2.6.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:
  firewire: ohci: work around VIA and NEC PHY packet reception bug
  firewire: core: do not use del_timer_sync() in interrupt context
  firewire: net: fix unicast reception RCODE in failure paths
  firewire: sbp2: fix stall with "Unsolicited response"
  firewire: sbp2: fix memory leak in sbp2_cancel_orbs or at send error
  ieee1394: Adjust confusing if indentation
---