]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 May 2011 19:48:05 +0000 (12:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 May 2011 19:48:05 +0000 (12:48 -0700)

Trivial merge