git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3411cb
d8ec26d
)
Merge tag 'v3.13' into for-3.15
author
Eric Paris
<eparis@redhat.com>
Fri, 7 Mar 2014 16:41:32 +0000
(11:41 -0500)
committer
Eric Paris
<eparis@redhat.com>
Fri, 7 Mar 2014 16:41:32 +0000
(11:41 -0500)
Linux 3.13
Conflicts:
include/net/xfrm.h
Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff