tree b415fdc68381a0fe56824c896053b6f93ddbd87b
parent 4940fc889e1e63667a15243028ddcd84d471cd8e
parent 5d320a205de277774962782a4b1923e4f8cdf781
author David S. Miller <davem@davemloft.net> 1304970485 -0700
committer David S. Miller <davem@davemloft.net> 1304970485 -0700

Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6