diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:34:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:34:39 -0800 |
| commit | a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5 (patch) | |
| tree | 9c4252d29637f1ccf393259b0709e65e5678f16d /drivers | |
| parent | 7971b96d922ccaaa2b732462c8f927af4259db60 (diff) | |
| parent | 6044565af458e7fa6e748bff437ecc49dea88d79 (diff) | |
| parent | 324719978dbb3ffad5a2e3d85af6c5dbbb766b99 (diff) | |
| download | linux-a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5.tar.bz2 | |
Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: core: fix unstable I/O with Canon camcorder
* 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: net: is not experimental anymore
firewire: net: invalidate ARP entries of removed nodes