projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b77d16 f629d20)
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)
commitcb178190ab7d9c9b9fb90e36488ebd26ca004d32
treeb2c7b9d6dda5600df21bb109eb7616b89039629dtree | snapshot (tar.gz zip)
parent7b77d161ce7e480a660692cab079712fc0268ba2commit | diff
parentf629d208d27a22f495b7734eede585b5d207e912commit | diff
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 diff1 | diff2 | blob | history