summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-18 16:20:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-18 16:20:05 -0700
commit6dab7ede9390d4d937cb89feca932e4fd575d2da (patch)
treebd5a12dd472c5cf7cdaf13ea4fcceae831e26e46 /drivers/sh
parentd9ec0fdc24743cb6aa9b7dee9064455cd26782f9 (diff)
parent89868730a756feca7e4b21a97c86487cd565ed22 (diff)
downloadkernel-6dab7ede9390d4d937cb89feca932e4fd575d2da.tar.gz
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King: "The largest thing in this set of changes is bringing back some of the ARMv3 code to fix a compile problem noticed on RiscPC, which we still support, even though we only support ARMv4 there. (The reason is that the system bus doesn't support ARMv4 half-word accesses, so we need the ARMv3 library code for this platform.) The rest are all quite minor fixes." * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE ARM: Bring back ARMv3 IO and user access code ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systems ARM: 7488/1: mm: use 5 bits for swapfile type encoding ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present ARM: 7486/1: sched_clock: update epoch_cyc on resume ARM: 7484/1: Don't enable GENERIC_LOCKBREAK with ticket spinlocks ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled ARM: 7482/1: topology: fix section mismatch warning for init_cpu_topology
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions