Merge remote-tracking branch 'ptr-ret/PTR_RET'

Conflicts:
	drivers/staging/zcache/zcache-main.c

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc drivers/acpi/acpi_pad.c
Simple merge

diff --cc drivers/char/tile-srom.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem_cma_helper.c
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/regulator/fan53555.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge