Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Mar 2011 23:06:01 +0000 (15:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Mar 2011 23:06:01 +0000 (15:06 -0800)

Trivial merge