Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next...
authorDavid S. Miller <davem@davemloft.net>
Sat, 27 Aug 2011 16:14:34 +0000 (12:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 27 Aug 2011 16:14:34 +0000 (12:14 -0400)

Trivial merge