summaryrefslogtreecommitdiff
path: root/fs/ubifs
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2015-03-25 11:03:07 +0200
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2015-03-25 11:03:07 +0200
commit3527a86b7ae17c949307d00e1eb7087604bca1b4 (patch)
tree8e8eab905e7e73a3bf2c4d47abd356166533c9db /fs/ubifs
parentb388e6a7a6ba988998ddd83919ae8d3debf1a13d (diff)
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff)
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')
0 files changed, 0 insertions, 0 deletions