| commit | b7d41a9fbb364c67d91c3588e117eba547e2d4bf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 25 08:05:29 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 25 08:05:29 2010 -0700 |
| tree | abf95ce77eaa8b7aed30fded4d3592b4af152a99 | |
| parent | da47c19e5c746829042933c8f945a71e2b62d6fc [diff] | |
| parent | 66fa12c571d35e3cd62574c65f1785a460105397 [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.