]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux...
authorDavid S. Miller <davem@davemloft.net>
Mon, 30 Sep 2013 19:36:45 +0000 (15:36 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Sep 2013 19:36:45 +0000 (15:36 -0400)
commit80c0b0cda2bcd877eec64ece36658dad51686bd6
treeb2c7b9d6dda5600df21bb109eb7616b89039629d
parentbcc0b3e07b8b3bca0b0deae2497e46c04609c266
parented3762062ef590ef1e528d20da571382a800beb7
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>
include/linux/netdevice.h