Merge branch 'sfc-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Apr 2011 00:10:52 +0000 (17:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Apr 2011 00:10:52 +0000 (17:10 -0700)

Trivial merge