Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

CONFIG_IPV6=y

# CONFIG_IPV6_SIT is not set

CONFIG_PANIC_TIMEOUT=0

CONFIG_HAS_WAKELOCK=y

CONFIG_WAKELOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_DM_CRYPT=y

CONFIG_POWER_SUPPLY=y

CONFIG_ANDROID_PARANOID_NETWORK=y

CONFIG_NET_ACTIVITY_STATS=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=y

CONFIG_USB_G_ANDROID=y

CONFIG_SWITCH=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOGGER=y

CONFIG_ANDROID_TIMED_OUTPUT=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ANDROID_INTF_ALARM_DEV=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_FUSE_FS=y

CONFIG_CPU_FREQ_GOV_INTERACTIVE=y

CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y

CONFIG_ION=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION_TEST=y

CONFIG_ION_DUMMY=y

CONFIG_ADF=y

CONFIG_ADF_FBDEV=y

CONFIG_ADF_MEMBLOCK=y

CONFIG_DMA_SHARED_BUFFER=y

CONFIG_TUN=y