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	9a5ad263a53455e57e8da84ed9df5b1443fb5621
tree	74a0cde11fbc619c227af89e0757036ab20323d0	tree \| snapshot
parent	ddfd18303df8d0a7f1f652f42c9812101719ed6c	commit \| diff
parent	9111474d1a8872430728d0b3391f839572c0b619	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