Merge branch 'master' into next
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by:
James Morris <jmorris@namei.org>
Showing
drivers/mtd/mtdbdi.c
deleted
100644 → 0
drivers/net/phy/micrel.c
0 → 100644
Please register or sign in to comment