Skip to content
Snippets Groups Projects
Commit cb178190 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux-2.6/trivial-mods 


Conflicts:
	include/linux/netdevice.h

More extern removals from Joe Perches.

Minor conflict with the dev_notify_flags changes which added a new
argument to __dev_notify_flags().

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7b77d161 f629d208
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 530 additions and 588 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment