summaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-24 19:55:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-24 19:55:41 -0700
commit88875667ebbcb95da3f93a4cf657d5dad7db9673 (patch)
tree7ac0e4fd89c0dde4cb0ec22fd9f8ba9c71c2f8af /fs/jffs2
parent8b306a2e7c8b23d65682fd70d861e2ba2ae10926 (diff)
parentc27cb97218b3e72417ffc5e73dce488844017b39 (diff)
downloadlinux-88875667ebbcb95da3f93a4cf657d5dad7db9673.tar.bz2
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
Diffstat (limited to 'fs/jffs2')
0 files changed, 0 insertions, 0 deletions