Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 21:00:48 +0000 (13:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 21:00:48 +0000 (13:00 -0800)

Trivial merge