diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-03 04:49:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-03 04:49:48 -0700 |
| commit | bd8762bec95ed81d5b81390ff23c5f83345cb536 (patch) | |
| tree | c2fe29079ccd3dd3a5218ad966ed0bab047d5e69 /include/crypto/pkcs7.h | |
| parent | c3fc7ac9a0b978ee8538058743d21feef25f7b33 (diff) | |
| parent | 9e8f4a548ab4710002c23c94c4b1bbde91b5e335 (diff) | |
| download | talos-op-linux-bd8762bec95ed81d5b81390ff23c5f83345cb536.tar.gz talos-op-linux-bd8762bec95ed81d5b81390ff23c5f83345cb536.zip | |
Merge branch 'switchdev-obj'
Jiri Pirko says:
====================
switchdev: bring back switchdev_obj
Second version of the patch extends to a patchset. Basically this patchset
brings object structure back which disappeared with recent Vivien's patchset.
Also it does a bit of naming changes in order to get the things in line.
Also, object id is put back into object structure.
Thanks to Scott and Vivien for review and suggestions.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/crypto/pkcs7.h')
0 files changed, 0 insertions, 0 deletions
