From: David S. Miller <davem@davemloft.net>
Date: Mon, 30 Sep 2013 19:36:45 +0000 (-0400)
Subject: Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux... 
X-Git-Tag: v3.13-rc1~105^2~273
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb178190ab7d9c9b9fb90e36488ebd26ca004d32;p=pandora-kernel.git

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: David S. Miller <davem@davemloft.net>
---

cb178190ab7d9c9b9fb90e36488ebd26ca004d32
Reading git-diff-tree failed