Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Nov 2011 00:21:10 +0000 (19:21 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Nov 2011 00:21:10 +0000 (19:21 -0500)

Trivial merge