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)
commit412d2907c41531b60c7ea1f38cfe1116daf2a229
tree05f6de4541734b82240629d9a21cb3df1b83d7ef
parent600ddd6825543962fb807884169e57b580dba208
parentba1a68bf1308a71a07d2462f4c38c242e08f92ba
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>