Merge branch 'davem.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Feb 2013 00:05:49 +0000 (19:05 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Feb 2013 00:05:49 +0000 (19:05 -0500)
commitb185af000984b41be45537780a456e2b979bfc17
tree369ce5a8bc423bee721f5f464fe3fbc4b9a95a0a
parent836dc9e3fbbab0c30aa6e664417225f5c1fb1c39
parent4521e1a94279ce610d3f9b7945c17d581f804242
Merge branch 'davem.r8169' of git://violet.fr.zoreil.com/romieu/linux

Revert two power saving r8169 changes to fix some regressions
reported.

Reported-by: Jörg Otte <jrg.otte@gmail.com>
Tested-by: Jörg Otte <jrg.otte@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>