From: Simon Horman <horms@verge.net.au>
Date: Tue, 6 Nov 2012 04:48:55 +0000 (+0900)
Subject: Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into... 
X-Git-Tag: next-20121107~14^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=de39c8b845a973dd036e6d1d58c7554e85f3b9af;p=karo-tx-linux.git

Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into next

Conflicts:
	arch/arm/configs/marzen_defconfig
---

de39c8b845a973dd036e6d1d58c7554e85f3b9af
diff --cc arch/arm/configs/kzm9g_defconfig
index c88b57886e79,b377a6f2c1c1,ce99e3e00efa,c88b57886e79..afbae287436b
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@@@@ -119,8 -119,7 -121,10 -119,8 +121,9 @@@@@ CONFIG_DMADEVICES=
    CONFIG_SH_DMAE=y
    CONFIG_ASYNC_TX_DMA=y
    CONFIG_STAGING=y
++ +CONFIG_SENSORS_AK8975=y
++ +CONFIG_IIO=y
    # CONFIG_DNOTIFY is not set
- --CONFIG_INOTIFY_USER=y
    CONFIG_VFAT_FS=y
    CONFIG_TMPFS=y
    # CONFIG_MISC_FILESYSTEMS is not set