Merge branch 'davem-next.via-rhine' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Jan 2012 22:53:49 +0000 (14:53 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Jan 2012 22:53:49 +0000 (14:53 -0800)

Trivial merge