]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b85cb1 f3f63ef)
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)
commit4834a16c46ccda2033f659427fca2ab42ceeb593
treeabf95ce77eaa8b7aed30fded4d3592b4af152a99tree | snapshot
parent2b85cb17f14aa0fe251be3b35497a4fd5bce79f2commit | diff
parentf3f63efafd80bdd4208bba80f93566d5b358e81ccommit | diff
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.