From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 21:34:39 +0000 (-0800)
Subject: Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branches 'fixes' and 'fwnet' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: core: fix unstable I/O with Canon camcorder

* 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: net: is not experimental anymore
  firewire: net: invalidate ARP entries of removed nodes
---

a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5