Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integrat...
authorDan Murphy <DMurphy@ti.com>
Wed, 10 Dec 2014 19:17:14 +0000 (13:17 -0600)
committerDan Murphy <DMurphy@ti.com>
Wed, 10 Dec 2014 19:17:14 +0000 (13:17 -0600)
TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  mtd: mtd_oobtest: Fix the address offset with vary_offset case
  mtd: mtd_oobtest: Fix bitflip_limit usage in test case 3
  mtd: mtd_oobtest: get rid of unused variable in memcmpshow()

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Trivial merge