• Linus Torvalds's avatar
    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 42cd71bf
    Linus Torvalds authored
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (137 commits)
      ARM: bcmring: convert to use sp804 clockevents
      ARM: bcmring: convert to sp804 clocksource
      ARM: 6912/1: bcmring: Add clkdev table in init_early
      clockevents: ARM sp804: obtain sp804 timer rate via clks
      clockevents: ARM sp804: allow clockevent name to be specified
      clocksource: ARM sp804: obtain sp804 timer rate via clks
      clocksource: ARM sp804: allow clocksource name to be specified
      clocksource: convert OMAP1 to 32-bit down counting clocksource
      clocksource: convert MXS timrotv2 to 32-bit down counting clocksource
      clocksource: convert SPEAr platforms 16-bit up counting clocksource
      clocksource: convert Integrator/AP 16-bit down counting clocksource
      clocksource: convert W90x900 24-bit down counting clocksource
      clocksource: convert ARM 32-bit down counting clocksources
      clocksource: convert ARM 32-bit up counting clocksources
      clocksource: add common mmio clocksource
      ARM: update sa1100 to reflect PXA updates
      ARM: omap1: convert to using readl/writel instead of volatile struct
      ARM: omap1: delete useless interrupt handler
      ARM: s5p: consolidate selection of timer register
      ARM: 6939/1: fix missing 'cpu_relax()' declaration
      ...
    42cd71bf
Kconfig 70.4 KB