Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jun 2008 04:37:14 +0000 (21:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jun 2008 04:37:14 +0000 (21:37 -0700)
commit5bbc1722d52ad3df062d5742a7e958276e57ebd7
tree8aa544f9a8623fba2fae933819627ceb839eac1f
parent30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74
parentae7b6487ec9c2e2a1551b9d291aa0dbbe0addf48
Merge branch 'davem-next' of /linux/kernel/git/jgarzik/netdev-2.6
include/linux/netdevice.h