Merge tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91 into next/cleanup
authorKevin Hilman <khilman@linaro.org>
Tue, 14 Jan 2014 23:41:48 +0000 (15:41 -0800)
committerKevin Hilman <khilman@linaro.org>
Tue, 14 Jan 2014 23:41:57 +0000 (15:41 -0800)
From Nicolas Ferre:
Second cleanup pull-request for 3.14:
- a tiny fix for the recent AT91 CCF implementation
- the switch of one platform to DT with board file removal

* tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91:
  ARM: at91: switch Calao QIL-A9260 board to DT
  clk: at91: fix pmc_clk_ids data type attriubte

Signed-off-by: Kevin Hilman <khilman@linaro.org>
1  2 
arch/arm/configs/at91sam9260_9g20_defconfig
drivers/clk/at91/pmc.c

Simple merge