| commit | be65de7174123e02477bd488db1a657caf0f9947 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 23 16:48:50 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 23 16:48:50 2014 -0400 |
| tree | ef3101980fef5d2f580026d96c78b40fe007b43b | |
| parent | 76fcee2438b90e473b67ea52b9b9e0648aa501f8 [diff] | |
| parent | 2e8a83c52ffa41816a979ab0e3bcadf4b0d9e8a1 [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>