Merge branch 'samsung/board' into next/boards

Conflicts:
	arch/arm/mach-s3c64xx/mach-crag6410.c

diff --cc arch/arm/mach-s3c64xx/mach-crag6410-module.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 988ac2e48f0818af97e8129e9134ae33d670884b,42d3d64947b03bcfa0719756cbb6aafa647ade62..799558c15b4eeb1d595fd5059cccb3af0fc69db4
--- 1/arch/arm/mach-s3c64xx/mach-crag6410.c
--- 2/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -37,7 -37,8 +37,9 @@@
  #include <linux/mfd/wm831x/irq.h>
  #include <linux/mfd/wm831x/gpio.h>
  
+ #include <sound/wm1250-ev1.h>
+ 
 +#include <asm/hardware/vic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>