git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)
commit	0b053c70e30d8a96e49b10f8ae5d11d8fbf172d2
tree	74a0cde11fbc619c227af89e0757036ab20323d0	tree \| snapshot
parent	2846ea97bb210ab401df68582a7ae2c08a994a0a	commit \| diff
parent	1f47e5110cb07c984f10c5d5fc78240a01d02fb1	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/exynos_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c	diff1 \|	diff2 \|	blob \| history