Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Mon, 30 Jan 2012 17:39:17 +0000 (12:39 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Jan 2012 17:39:17 +0000 (12:39 -0500)

Trivial merge