From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 22 May 2014 14:27:17 +0000 (+0900)
Subject: Merge 3.15-rc6 into staging-next.
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~36^2~650
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c1f05379a34786da96d0fdedc111cdcdecdf6f;p=pandora-kernel.git

Merge 3.15-rc6 into staging-next.

This resolves the conflicts in the files:
	drivers/iio/adc/Kconfig
	drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

69c1f05379a34786da96d0fdedc111cdcdecdf6f
Reading git-diff-tree failed