Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 4 Apr 2011 17:39:12 +0000 (10:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Apr 2011 17:39:12 +0000 (10:39 -0700)
commit083dd8b8aacfcb62d65fb53ec744090879dd8150
treed48017ad6caa13f5a31c23186b16c36a84776c49
parent95b8fbada76d978ce13a26785f8b85ff54478bb2
parenta14b289d4614bb3b25d0455d68f72f3c7b4cc8e8
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
include/linux/netdevice.h