diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:53:54 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:53:54 +0200 |
| commit | 2bc2319cbe2ec8ead62b816cc15ed155486f0ae0 (patch) | |
| tree | 3c2336749da4cbb881ebe56903f9f026e17b4a4e /fs/jbd/commit.c | |
| parent | 682bdfb751e081a6633c78a2cf20e2d81a2ca03c (diff) | |
| parent | 49d7012c4c62f6681378a56d9af4d721178b8ad3 (diff) | |
| download | kernel-crypto-2bc2319cbe2ec8ead62b816cc15ed155486f0ae0.tar.gz kernel-crypto-2bc2319cbe2ec8ead62b816cc15ed155486f0ae0.tar.xz kernel-crypto-2bc2319cbe2ec8ead62b816cc15ed155486f0ae0.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
crypto/userspace/ncr-int.h
crypto/userspace/ncr-limits.c
Diffstat (limited to 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions