Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Sun, 11 Mar 2012 22:34:01 +0000 (15:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Mar 2012 22:34:01 +0000 (15:34 -0700)

Trivial merge