diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2015-03-25 10:03:07 +0100 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2015-03-25 10:03:07 +0100 |
commit | 3527a86b7ae17c949307d00e1eb7087604bca1b4 (patch) | |
tree | 8e8eab905e7e73a3bf2c4d47abd356166533c9db /fs/ubifs/dir.c | |
parent | UBI: fix missing brace control flow (diff) | |
parent | Linux 4.0-rc5 (diff) | |
download | linux-3527a86b7ae17c949307d00e1eb7087604bca1b4.tar.xz linux-3527a86b7ae17c949307d00e1eb7087604bca1b4.zip |
Merge tag 'v4.0-rc5' into linux-next
Merge the upstream -rc5 tag because we needed a more up-to-date base our
further work.
Diffstat (limited to 'fs/ubifs/dir.c')
0 files changed, 0 insertions, 0 deletions