aboutsummaryrefslogtreecommitdiff
path: root/Documentation/acpi
diff options
context:
space:
mode:
authorLinus Torvalds2015-04-24 08:10:53 -0700
committerLinus Torvalds2015-04-24 08:10:53 -0700
commitfb65d872d7a8dc629837a49513911d0281577bfd (patch)
tree0c6928094671d99e24f17e778468763a7ce52662 /Documentation/acpi
parent05f0c553e2155b93a9b4edb96898458762bda867 (diff)
parent6b7acae74fc2ffe6cfd7592e95ca933cadb31219 (diff)
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "A few fixes for the recently merged development updates: - the update to convert a code branch in the procinfo structure forgot to update the nommu code. - VDSO only supported for V7 CPUs and later. - VDSO build creates files which should be ignored by git but are not. - ensure that make arch/arm/vdso/ doesn't build if it isn't enabled" * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile ARM: 8343/1: VDSO: add build artifacts to .gitignore ARM: Fix nommu booting ARM: 8342/1: VDSO: depend on CPU_V7
Diffstat (limited to 'Documentation/acpi')
0 files changed, 0 insertions, 0 deletions