Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 14 Jul 2011 15:43:32 +0000 (08:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Jul 2011 15:43:32 +0000 (08:43 -0700)

Trivial merge