]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 3.15-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Apr 2014 17:08:40 +0000 (10:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Apr 2014 17:08:40 +0000 (10:08 -0700)
commit4b824faf7ccea56f56b6bbf8cfaca84a64a5472b
treeabe4b4b586978773e2df21898eda611bc6eb822c
parent2802d4a1d0940391c536624c92e0bb08f90ca2ca
parent480ecc916679014c8b1cad0f42ff0dbbc2b461b8
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>
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/comedi_fops.c
drivers/staging/goldfish/goldfish_audio.c
drivers/staging/rtl8723au/core/rtw_wlan_util.c
drivers/staging/vme/devices/vme_user.c