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

Trivial merge