Greg Kroah-Hartman 69c1f05379 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>
2014-05-22 23:27:17 +09:00
..
2011-10-24 16:52:39 +02:00
evm
2011-07-18 12:29:40 -04:00
2010-10-21 20:21:03 -04:00
2013-03-23 16:11:31 -07:00
2012-03-28 18:41:23 +01:00
2011-03-31 11:26:23 -03:00
2012-04-23 14:23:32 +03:00
2011-03-22 04:53:09 -03:00
2014-04-25 12:25:42 -06:00
2008-11-12 17:17:18 -08:00
2011-03-31 11:26:23 -03:00
2013-10-17 00:36:06 +02:00
2013-06-21 11:32:51 +02:00
2013-12-18 16:51:15 -08:00
2011-04-29 18:09:34 -07:00
2009-02-18 15:37:56 -08:00
2009-09-23 07:39:48 -07:00
2008-04-19 19:10:28 -07:00
2012-06-25 13:48:15 +02:00
2008-07-24 10:47:17 -07:00
2014-03-12 00:54:53 +01:00
2009-06-18 13:04:04 -07:00