Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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.

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc drivers/Makefile
Simple merge