projects
/
sdk
/
emulator
/
emulator-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
600ddd6
ba1a68b
)
Merge branch 'bpf'
author
David S. Miller
<davem@davemloft.net>
Tue, 27 Jan 2015 01:20:48 +0000
(17:20 -0800)
committer
David 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