]> git.karo-electronics.de Git - mv-sheeva.git/commit - sound/soc/pxa/em-x270.c
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7971b96 6044565 3247199)
Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 21:34:39 +0000 (13:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 21:34:39 +0000 (13:34 -0800)
commita1d3f5b70d13b7035f925de1f2ba0003a04b9ac5
tree9c4252d29637f1ccf393259b0709e65e5678f16dtree | snapshot
parent7971b96d922ccaaa2b732462c8f927af4259db60commit | diff
parent6044565af458e7fa6e748bff437ecc49dea88d79commit | diff
parent324719978dbb3ffad5a2e3d85af6c5dbbb766b99commit | diff
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
Linux for Marvell Sheeva based platforms