Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 20:16:52 +0000 (12:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 20:16:52 +0000 (12:16 -0800)

Trivial merge