]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06ebe55 53a76e5)
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)
commit524d5b2e072668abeae2a2c19be58023a70b0026
treeef3101980fef5d2f580026d96c78b40fe007b43btree | snapshot
parent06ebe555af0ec6355d25ae3c11ca889d75b1c1c1commit | diff
parent53a76e5bf9fe3a81292737604cc54fdbfe7f2695commit | 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>
Linux Kernel Source Tree.