From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Oct 2010 15:05:29 +0000 (-0700)
Subject: Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~131
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b7d41a9fbb364c67d91c3588e117eba547e2d4bf

Merge branch 'ieee1394-removal' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: remove the old IEEE 1394 driver stack
  ieee1394: move init_ohci1394_dma to drivers/firewire/

Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
getting removed, but was modified by the networking merge.
---

b7d41a9fbb364c67d91c3588e117eba547e2d4bf