Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

Conflicts:

	drivers/net/s2io.c

...

This commit is contained in:

David S. Miller 2008-04-02 22:35:23 -07:00

parent c0f39322c3 802fb176d8

commit e1ec1b8ccd

55 changed files with 286 additions and 687 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

include/linux/netdevice.h

View file