]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'qcom-defconfig-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 31 May 2014 03:33:39 +0000 (20:33 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 31 May 2014 03:33:39 +0000 (20:33 -0700)
Merge "Qualcomm ARM Based defconfig Updates for v3.16-2" from Kumar Gala:

* Enable qcom GSBI driver

* tag 'qcom-defconfig-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Enable GSBI driver in defconfig

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

Trivial merge