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

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

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 22 Apr 2014 17:08:40 +0000 (10:08 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 22 Apr 2014 17:08:40 +0000 (10:08 -0700)
commit	4b824faf7ccea56f56b6bbf8cfaca84a64a5472b
tree	abe4b4b586978773e2df21898eda611bc6eb822c	tree \| snapshot
parent	2802d4a1d0940391c536624c92e0bb08f90ca2ca	commit \| diff
parent	480ecc916679014c8b1cad0f42ff0dbbc2b461b8	commit \| diff

Merge 3.15-rc2 into staging-next

This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.

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

Linux Kernel Source Tree.

RSS Atom

drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/goldfish/goldfish_audio.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723au/core/rtw_wlan_util.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vme/devices/vme_user.c	diff1 \|	diff2 \|	blob \| history