Skip to content
  • Linus Torvalds's avatar
    Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 1d3c6ff4
    Linus Torvalds authored
    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits)
      ARM: remove 'select GENERIC_TIME'
      ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO
      ARM: 6074/1: oprofile: convert from sysdev to platform device
      ARM: 6073/1: oprofile: remove old files and update KConfig
      ARM: 6072/1: oprofile: use perf-events framework as backend
      ARM: 6071/1: perf-events: allow modules to query the number of hardware counters
      ARM: 6070/1: perf-events: add support for xscale PMUs
      ARM: 6069/1: perf-events: use numeric ID to identify PMU
      ARM: 6064/1: pmu: register IRQs at runtime
      ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA
      ARM: 6134/1: Handle instruction cache maintenance fault properly
      ARM: nwfpe: allow debugging output to be configured at runtime
      ARM: rename mach_cpu_disable() to platform_cpu_disable()
      ARM: 6132/1: PL330: Add common core driver
      ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310
      ARM: Move memory mapping into mmu.c
      ARM: Ensure meminfo is sorted prior to sanity_check_meminfo
      ARM: Remove useless linux/bootmem.h includes
      ARM: convert /proc/cpu/aligment to seq_file
      arm: use asm-generic/scatterlist.h
      ...
    1d3c6ff4