Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 4 Mar 2016 11:12:08 +0000 (12:12 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 4 Mar 2016 11:12:08 +0000 (12:12 +0100)
commitbc94b99636dc7bcccce439a9fb9c00065e2e2627
treebddbd29a5fd7b2d270d039efc1d6858791a2c98f
parent4650bac1fc45d64aef62ab99aa4db93d41dedbd9
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/mips/kernel/setup.c
include/linux/mm.h
kernel/memremap.c
kernel/resource.c