git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b77d16
f629d20
)
Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux...
author
David S. Miller
<davem@davemloft.net>
Mon, 30 Sep 2013 19:36:45 +0000
(15:36 -0400)
committer
David S. Miller
<davem@davemloft.net>
Mon, 30 Sep 2013 19:36:45 +0000
(15:36 -0400)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff