From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Feb 2016 23:10:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'qcom/for-next'
X-Git-Tag: next-20160210~105
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f50a5c43244323cfdf7f6ff13c55fbd026d21fff;p=karo-tx-linux.git

Merge remote-tracking branch 'qcom/for-next'
---

f50a5c43244323cfdf7f6ff13c55fbd026d21fff
diff --cc MAINTAINERS
index 917560d4461b,661ec0e24575..44591779f06d
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1433,8 -1425,9 +1433,10 @@@ S:	Maintaine
  F:	arch/arm/boot/dts/qcom-*.dts
  F:	arch/arm/boot/dts/qcom-*.dtsi
  F:	arch/arm/mach-qcom/
 +F:	arch/arm64/boot/dts/qcom/*
+ F:	drivers/i2c/busses/i2c-qup.c
  F:	drivers/soc/qcom/
+ F:	drivers/spi/spi-qup.c
  F:	drivers/tty/serial/msm_serial.h
  F:	drivers/tty/serial/msm_serial.c
  F:	drivers/*/pm8???-*