git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 836dc9e 4521e1a)
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)
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>

Trivial merge
Pandora Kernel Repository