![]() This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drivers/staging/intel_sst/intel_sst_app_interface.c All should be resolved now. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
---|---|---|
.. | ||
api | ||
arch/arm | ||
block | ||
device | ||
gadget | ||
include/linux/westbridge | ||
Kconfig | ||
Makefile |