diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-08 02:37:01 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-08 02:37:01 +0400 |
| commit | d978a6361ad13f1f9694fcb7b5852d253a544d92 (patch) | |
| tree | 8e8a8c62286fab2c044c4b53563222c1b66d7cb0 /security | |
| parent | 8303e699f7089a1cd1421750fb33f289e5f3e1b9 (diff) | |
| parent | cb28ea3b13b86fb23448525f34720e659bda7aa8 (diff) | |
| download | linux-d978a6361ad13f1f9694fcb7b5852d253a544d92.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c
Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions