projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da47c19 66fa12c)
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Oct 2010 15:05:29 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Oct 2010 15:05:29 +0000 (08:05 -0700)
commitb7d41a9fbb364c67d91c3588e117eba547e2d4bf
treeabf95ce77eaa8b7aed30fded4d3592b4af152a99tree | snapshot
parentda47c19e5c746829042933c8f945a71e2b62d6fccommit | diff
parent66fa12c571d35e3cd62574c65f1785a460105397commit | diff
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.
Documentation/feature-removal-schedule.txt diff1 | diff2 | blob | history
drivers/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.