diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-13 03:20:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-13 03:20:20 +0100 |
| commit | 60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af (patch) | |
| tree | e95a890586b5d8113de5d1516a8b73add32876b0 /net/nfc/netlink.c | |
| parent | Merge tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs (diff) | |
| parent | ubifs: Use XATTR_*_PREFIX_LEN (diff) | |
| download | linux-60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af.tar.xz linux-60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af.zip | |
Merge tag 'upstream-4.5-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
"This contains three changes - two cleanups and one UBI wear leveling
improvement by Sebastian Siewior"
* tag 'upstream-4.5-rc1' of git://git.infradead.org/linux-ubifs:
ubifs: Use XATTR_*_PREFIX_LEN
UBIFS: add a comment in key.h for unused parameter
mtd: ubi: wl: avoid erasing a PEB which is empty
Diffstat (limited to 'net/nfc/netlink.c')
0 files changed, 0 insertions, 0 deletions