From: David S. Miller <davem@davemloft.net>
Date: Fri, 23 May 2014 20:48:50 +0000 (-0400)
Subject: Merge branch 'filter-next'
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be65de7174123e02477bd488db1a657caf0f9947;p=pandora-kernel.git

Merge branch 'filter-next'

Daniel Borkmann says:

====================
BPF updates

These were still in my queue. Please see individual patches for
details.

I have rebased these on top of current net-next with Andrew's
gcc union fixup [1] applied to avoid dealing with an unnecessary
merge conflict.

 [1] http://patchwork.ozlabs.org/patch/351577/
====================

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

be65de7174123e02477bd488db1a657caf0f9947
Reading git-diff-tree failed