]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2008 18:50:00 +0000 (11:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2008 18:50:00 +0000 (11:50 -0700)
1  2 
drivers/net/atlx/atl1.c

Simple merge