Merge branch 'sfc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 May 2012 02:49:57 +0000 (22:49 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 May 2012 02:49:57 +0000 (22:49 -0400)

Trivial merge