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

Trivial merge