]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1705dd ce76185)
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)
commita30ffda6b44ad6555fc326c98c0646a3f54cd525
treeb2c7b9d6dda5600df21bb109eb7616b89039629dtree | snapshot
parenta1705dd80eeaf5e337872752e1b69f5a0dbe97b5commit | diff
parentce7618552681ad34e272a9c39f631f58e7191418commit | 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
Linux Kernel Source Tree.