git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
11b57f9
74f77a6
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
author
David S. Miller
<davem@davemloft.net>
Fri, 10 Jan 2014 19:50:02 +0000
(14:50 -0500)
committer
David S. Miller
<davem@davemloft.net>
Fri, 10 Jan 2014 19:50:02 +0000
(14:50 -0500)
Pablo Neira Ayuso says:
====================
This batch contains one single patch with the l2tp match
for xtables, from James Chapman.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff