diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-23 18:07:42 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-23 18:07:42 +0200 |
| commit | da3eeeff5744e8ea4bcdb819db3afad6437f5231 (patch) | |
| tree | e9e92f4856b03aed9bcd1098625e0db060512140 /fs/jbd/commit.c | |
| parent | 732e36a02b032e6cacd26694da55629b5e32c3bd (diff) | |
| parent | 16ace6317db2c47b36b08b0addfe91356151c08d (diff) | |
| download | kernel-crypto-da3eeeff5744e8ea4bcdb819db3afad6437f5231.tar.gz kernel-crypto-da3eeeff5744e8ea4bcdb819db3afad6437f5231.tar.xz kernel-crypto-da3eeeff5744e8ea4bcdb819db3afad6437f5231.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
.gitignore
Diffstat (limited to 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions