summaryrefslogtreecommitdiffstats
path: root/fs/ubifs/dir.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2015-03-25 10:03:07 +0100
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2015-03-25 10:03:07 +0100
commit3527a86b7ae17c949307d00e1eb7087604bca1b4 (patch)
tree8e8eab905e7e73a3bf2c4d47abd356166533c9db /fs/ubifs/dir.c
parentUBI: fix missing brace control flow (diff)
parentLinux 4.0-rc5 (diff)
downloadlinux-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