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)
commitf3e438f0f776024aa3979e717a0f65f85fe9c6f3
tree0a636cc5b427e171ab4a04fc889a3f1e6ad961ef
parente4e11180dfa545233e5145919b75b7fac88638df
parente92b9b3b091d5fcdaed91d6fa9410deae135704b
Merge branch 'davem-next.via-rhine' of git://violet.fr.zoreil.com/romieu/linux