diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-11-30 19:53:12 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-11-30 19:53:12 +0800 |
commit | 479d014de544a0916037fcf77e873f815545cd5e (patch) | |
tree | 6752a8184e2f2696c31ab141576e9902410c6c75 /kernel/tsacct.c | |
parent | 585b5fa63da92b2d46d5c1735a5c46e9a1486bbe (diff) | |
parent | 57891633eeef60e732e045731cf20e50ee80acb4 (diff) | |
download | linux-479d014de544a0916037fcf77e873f815545cd5e.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in chelsio chcr fix.
Diffstat (limited to 'kernel/tsacct.c')
0 files changed, 0 insertions, 0 deletions