Merge branch 'sfc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
commitf88cf73d80cca0c56bb35168cc857d1c78c8c0b9
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 20:23:31 +0000 (24 16:23 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 20:23:31 +0000 (24 16:23 -0400)
tree9ab9160abac94d9a646a5e1b464084364f048698
parentcd5c2ed6fea362a295a3494ca97fa2e47f5bf49a
parentac70b2e9a13423b5efa0178e081936ce6979aea5
Merge branch 'sfc-3.6' of git://git./linux/kernel/git/bwh/sfc

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>