git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
34d92d5
320437a
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Wed, 23 Oct 2013 20:28:39 +0000
(16:28 -0400)
committer
David S. Miller
<davem@davemloft.net>
Wed, 23 Oct 2013 20:49:34 +0000
(16:49 -0400)
Conflicts:
drivers/net/usb/qmi_wwan.c
include/net/dst.h
Trivial merge conflicts, both were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff