Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 Apr 2012 19:13:37 +0000 (15:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Apr 2012 19:13:37 +0000 (15:13 -0400)

Trivial merge