Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Jan 2011 20:42:38 +0000 (12:42 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Jan 2011 20:42:38 +0000 (12:42 -0800)

Trivial merge