Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

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

diff --cc arch/arm/mach-at91/board-qil-a9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9-l9260.c
Simple merge

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

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

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

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

diff --cc arch/arm/mach-at91/board-usb-a9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a9263.c
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
index 598b9cb,4864723..b216bfb
--- 1/drivers/i2c/busses/i2c-s3c2410.c
--- 2/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@@ -33,8 -33,9 +33,9 @@@
  #include <linux/err.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
+ #include <linux/cpufreq.h>
  
 -#include <asm/hardware.h>
 +#include <asm/arch/hardware.h>
  #include <asm/irq.h>
  #include <asm/io.h>
  

diff --cc drivers/spi/spi_s3c24xx.c
Simple merge