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

Trivial merge