Merge "defconfig: msm: disable RMI4 dev module"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 6 Oct 2016 08:07:04 +0000 (01:07 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Thu, 6 Oct 2016 08:07:04 +0000 (01:07 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 6 Oct 2016 08:07:04 +0000 (01:07 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 6 Oct 2016 08:07:04 +0000 (01:07 -0700)
diff --cc arch/arm/configs/msmfalcon_defconfig
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 6 Oct 2016 08:07:04 +0000 (01:07 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 6 Oct 2016 08:07:04 +0000 (01:07 -0700)