Merge remote-tracking branch 'at91/at91-next'

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam926x_time.c
	arch/arm/mach-at91/at91sam9_alt_reset.S
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-at91/generic.h
	arch/arm/mach-at91/gpio.c
	arch/arm/mach-at91/include/mach/at91cap9.h
	arch/arm/mach-at91/include/mach/at91sam9260.h
	arch/arm/mach-at91/include/mach/at91sam9261.h
	arch/arm/mach-at91/include/mach/at91sam9263.h
	arch/arm/mach-at91/include/mach/at91sam9g45.h
	arch/arm/mach-at91/include/mach/at91sam9rl.h
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-at91/pm.c
	arch/arm/mach-at91/setup.c

diff --cc arch/arm/mach-at91/pm.c
Simple merge