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

Browse source

Conflicts:

	drivers/net/ppp_generic.c

...

This commit is contained in:

David S. Miller 2008-12-23 17:56:23 -08:00

parent 908a7a16b8 739840d529

commit 6332178d91

8 changed files with 29 additions and 24 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

net/bluetooth/rfcomm/core.c

View file

1

net/socket.c

View file