diff options
| author | Linus Torvalds <[email protected]> | 2011-01-21 21:34:39 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-01-21 21:34:39 +0000 |
| commit | a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5 (patch) | |
| tree | 9c4252d29637f1ccf393259b0709e65e5678f16d /fs/proc/array.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | firewire: core: fix unstable I/O with Canon camcorder (diff) | |
| parent | firewire: net: is not experimental anymore (diff) | |
| download | kernel-a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5.tar.gz kernel-a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5.zip | |
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