]> err.no Git - linux-2.6/commitdiff
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)
1  2 
include/linux/netdevice.h

Simple merge