Merge branch 'v3.10/topic/configs' of git://git.linaro.org/kernel/linux-linaro-stable...

diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index e1bf601fc57d9c1d933afb75f4026c78af5fbbfc..e4fd1ad190285311acb1464fbe1539916f0a1e0b 100644 (file)
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -39,3 +39,4 @@ CONFIG_ADF=y
 CONFIG_ADF_FBDEV=y
 CONFIG_ADF_MEMBLOCK=y
 CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_TUN=y

diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf
index fbcfed1b6ce8501b52ed702151ab9cc985d7ef2a..a89a2e2b38a5a917abc3938457e49a8e4612b3d2 100644 (file)
--- a/linaro/configs/distribution.conf
+++ b/linaro/configs/distribution.conf
@@ -25,6 +25,7 @@ CONFIG_IP6_NF_MANGLE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE=m
+CONFIG_TUN=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_BLK_DEV_RAM=y