diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-12-04 12:05:18 +0000 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-12-04 12:05:18 +0000 |
| commit | aca2a2cda8ae17c08fc1c56581c47ed970de41b7 (patch) | |
| tree | 1bafcfbffe9a89b261698e42cc9e5017a31dd1b8 /arch/arm64/include/asm/cputype.h | |
| parent | 977623b23419d6349c4f84ad6f2b969f31fc5e57 (diff) | |
| parent | bd8676e7bd1c213d944b7c9404615cd7ce02cba4 (diff) | |
Merge branch 'msalter/armv8-uefi-latest' of git://git.linaro.org/arm/acpi/acpi into leg-kernel
Conflicts:
Documentation/devicetree/bindings/staging/dwc2.txt
arch/arm/Kconfig
arch/arm/boot/dts/bcm11351-brt.dts
arch/arm/boot/dts/bcm11351.dtsi
arch/arm/boot/dts/bcm28155-ap.dts
arch/arm/common/Kconfig
drivers/Kconfig
drivers/cpufreq/arm_big_little.c
drivers/cpufreq/arm_big_little.h
drivers/cpufreq/cpufreq_interactive.c
drivers/cpufreq/cpufreq_stats.c
drivers/mmc/core/sd.c
drivers/usb/gadget/s3c-hsotg.c
include/linux/efi.h
include/uapi/linux/input.h
kernel/time/alarmtimer.c
kernel/trace/trace_functions_graph.c
lib/Kconfig.debug
mm/page_alloc.c
Diffstat (limited to 'arch/arm64/include/asm/cputype.h')
0 files changed, 0 insertions, 0 deletions