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

Browse source

Conflicts:
	drivers/net/can/Kconfig

...

This commit is contained in:

David S. Miller 2009-11-17 00:05:02 -08:00

parent 5c427ff9e4 82b3cc1a2f

commit a2bfbc072e

32 changed files with 365 additions and 467 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

2

include/net/sctp/structs.h

View file