diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-03 01:20:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-03 01:20:59 +0100 |
| commit | deef2a118aed02aa9421e399056c82045e728282 (patch) | |
| tree | ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f /crypto/mcryptd.c | |
| parent | staging: unisys: remove pointless macros (diff) | |
| parent | Linux 3.18-rc7 (diff) | |
| download | linux-deef2a118aed02aa9421e399056c82045e728282.tar.xz linux-deef2a118aed02aa9421e399056c82045e728282.zip | |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/mcryptd.c')
0 files changed, 0 insertions, 0 deletions