Merge branch 'bpf'
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 01:20:48 +0000 (17:20 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 01:20:48 +0000 (17:20 -0800)
Alexei Starovoitov says:

====================
bpf: fix two bugs

Michael Holzheu caught two issues (in bpf syscall and in the test).
Fix them. Details in corresponding patches.
====================

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

Trivial merge