git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e139862
1c5ad13
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
author
David S. Miller
<davem@davemloft.net>
Sat, 2 Nov 2013 06:13:48 +0000
(
02:13
-0400)
committer
David S. Miller
<davem@davemloft.net>
Sat, 2 Nov 2013 06:13:48 +0000
(
02:13
-0400)
Conflicts:
net/xfrm/xfrm_policy.c
Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff