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)
commit8b91ac09732895f928ed6107bda5318cf260520b
tree5fc787bb3e0f4a4f84a928b7708023e4996608cd
parent8aca6cb1179ed9bef9351028c8d8af852903eae2
parent56997fa838e333cea33ab641d4aeedd23aef0eb1
Merge branch 'davem-fixes' of /linux/kernel/git/jgarzik/netdev-2.6
drivers/net/atlx/atl1.c