mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-19 02:34:01 +08:00
This is to fix a merge problem with mach-highbank/hotplug.c, which git silently resolves, but wrongly. This commit contains the correct resolution. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
||
---|---|---|
.. | ||
core.h | ||
highbank.c | ||
hotplug.c | ||
Kconfig | ||
Makefile | ||
platsmp.c | ||
pm.c | ||
smc.S | ||
sysregs.h | ||
system.c |