Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Mon, 5 Dec 2011 23:27:28 +0000 (18:27 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Dec 2011 23:27:28 +0000 (18:27 -0500)

Trivial merge