Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18

* v3.18/topic/configs:
  linaro-base.conf: remove CONFIG_NFS_V2 is not set

linaro/configs/linaro-base.conf

+0 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ CONFIG_JFFS2_RUBIN=y
		CONFIG_CRAMFS=y
		CONFIG_NETWORK_FILESYSTEMS=y
		CONFIG_NFS_FS=y
		# CONFIG_NFS_V2 is not set
		CONFIG_NFS_V3=y
		CONFIG_NFS_V3_ACL=y
		CONFIG_NFS_V4=y