mirror of https://gitee.com/openkylin/linux.git
f341dddf1d
There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
TODO | ||
smtcfb.c | ||
smtcfb.h |