Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2009 08:32:26 +0000 (01:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2009 08:32:26 +0000 (01:32 -0700)
Conflicts:
net/core/dev.c


Trivial merge