Merge branch 'bpf-next'
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Jul 2015 18:13:21 +0000 (11:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Jul 2015 18:13:21 +0000 (11:13 -0700)
Daniel Borkmann says:

====================
Minor BPF updates

Various minor misc updates.
====================

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

Trivial merge