projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76fcee2 2e8a83c)
Merge branch 'filter-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 May 2014 20:48:50 +0000 (16:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 May 2014 20:48:50 +0000 (16:48 -0400)
commitbe65de7174123e02477bd488db1a657caf0f9947
treeef3101980fef5d2f580026d96c78b40fe007b43btree | snapshot (tar.gz zip)
parent76fcee2438b90e473b67ea52b9b9e0648aa501f8commit | diff
parent2e8a83c52ffa41816a979ab0e3bcadf4b0d9e8a1commit | diff
Merge branch 'filter-next'

Daniel Borkmann says:

====================
BPF updates

These were still in my queue. Please see individual patches for
details.

I have rebased these on top of current net-next with Andrew's
gcc union fixup [1] applied to avoid dealing with an unnecessary
merge conflict.

 [1] http://patchwork.ozlabs.org/patch/351577/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>