tree 05f6de4541734b82240629d9a21cb3df1b83d7ef
parent 600ddd6825543962fb807884169e57b580dba208
parent ba1a68bf1308a71a07d2462f4c38c242e08f92ba
author David S. Miller <davem@davemloft.net> 1422321648 -0800
committer David S. Miller <davem@davemloft.net> 1422321648 -0800

Merge branch 'bpf'

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>