diff options
| author | Linus Torvalds <[email protected]> | 2016-03-25 02:55:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-03-25 02:55:41 +0000 |
| commit | 88875667ebbcb95da3f93a4cf657d5dad7db9673 (patch) | |
| tree | 7ac0e4fd89c0dde4cb0ec22fd9f8ba9c71c2f8af /net/switchdev/switchdev.c | |
| parent | Merge tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | ubifs: Remove unused header (diff) | |
| download | kernel-88875667ebbcb95da3f93a4cf657d5dad7db9673.tar.gz kernel-88875667ebbcb95da3f93a4cf657d5dad7db9673.zip | |
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 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions