mirror of https://gitee.com/openkylin/linux.git
944483d033
This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
bootp | ||
compressed | ||
dts | ||
.gitignore | ||
Makefile | ||
install.sh |