From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Jan 2015 01:20:48 +0000 (-0800)
Subject: Merge branch 'bpf'
X-Git-Tag: fixes-v4.0-rc1~235^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=412d2907c41531b60c7ea1f38cfe1116daf2a229;p=pandora-kernel.git

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>
---

412d2907c41531b60c7ea1f38cfe1116daf2a229