]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd5c2ed ac70b2e)
Merge branch 'sfc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 20:23:31 +0000 (16:23 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 20:23:31 +0000 (16:23 -0400)
Ben Hutchings says:

====================
Simple fix for a braino.  Please also queue this for the 3.4 and 3.5
stable series.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG