From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Mar 2016 02:55:41 +0000 (-0700)
Subject: Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.14-rc1~3537
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88875667ebbcb95da3f93a4cf657d5dad7db9673;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS updates from Richard Weinberger:
 "This contains cleanups and a maintainer update for UBI and UBIFS"

* tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs:
  ubifs: Remove unused header
  MAINTAINERS: Update UBIFS entry
  mtd: ubi: Add logging functions ubi_msg, ubi_warn and ubi_err
  ubifs: Add logging functions for ubifs_msg, ubifs_err and ubifs_warn
---

88875667ebbcb95da3f93a4cf657d5dad7db9673