diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 07:46:15 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 07:46:15 +0200 |
| commit | 9f0a6ce7f41043dad38b272cd6ad165f98827b8b (patch) | |
| tree | 909f5dcc886a1ad32ab0a00bc0455c566e1037c2 /fs/jbd2/commit.c | |
| parent | c07dc584248074d16c371d2a478bc23520bef69f (diff) | |
| parent | 1f30d575e5b413e522d6b3e95d3e348df9e9c69e (diff) | |
| download | kernel-crypto-9f0a6ce7f41043dad38b272cd6ad165f98827b8b.tar.gz kernel-crypto-9f0a6ce7f41043dad38b272cd6ad165f98827b8b.tar.xz kernel-crypto-9f0a6ce7f41043dad38b272cd6ad165f98827b8b.zip | |
Merge remote branch 'origin/newapi'
Conflicts:
examples/ncr.c
examples/pk.c
ncr-key-wrap.c
ncr-key.c
ncr.h
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions