Merge tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 20:23:33 +0000 (13:23 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 20:23:33 +0000 (13:23 -0700)
commita6964d90fe54ac0a5c610fea0f5b6f6608c22b2a
tree7dc331b9de88be49bb0f23f7fcf8e01a1cc46acb
parent37267675c9f0037b550d6c4c253a669fb728dfe5
parentdc344b62121c4e2ba5bd9d5bf7a2b4ce5f0487ce
Merge tag 'qcom-defconfig-for-4.1-1' of git://git./linux/kernel/git/galak/linux-qcom into next/defconfig

Merge "qcom defconfig changes for 4.1-1" from Kumar Gala:

Qualcomm ARM Based defconfig Updates for v4.1-1

* Increase MMC_BLOCK_MINORS to 32 since qcom platforms have more than
  16 partitions

* tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>