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>
Thu, 12 May 2011 20:26:45 +0000 (16:26 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 May 2011 20:26:45 +0000 (16:26 -0400)

Trivial merge