projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fdd5f43 e8d9612)
Merge branch 'pktdiag'
authorDavid S. Miller <davem@davemloft.net>
Mon, 29 Apr 2013 17:22:07 +0000 (13:22 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Apr 2013 17:22:07 +0000 (13:22 -0400)
commit13ccf043ce85b64802a57bd3e47ca1505b6bf275
tree16093300e9da78c1c3e272283ae4886d7b3984e8tree | snapshot (tar.gz zip)
parentfdd5f43a1b53a844d04c6eda2cbdbe044b629ae7commit | diff
parente8d9612c181b1a68ba5f71384629343466f1bd13commit | diff
Merge branch 'pktdiag'

Nicolas Dichtel says:

====================
The goal of this patchset is to be able to get all infos exported via the
/proc/net/packet and also beeing able to get filter associated to af_packet
sockets.

As usual, the patch against iproute2 will be sent once the patches are included
and net-next merged. I can send it on demand.
====================

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