1. 16 1月, 2011 2 次提交
    • L
      Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm · 16c10203
      Linus Torvalds 提交于
      * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)
        ARM: pxa: fix building issue of missing physmap.h
        ARM: mmp: PXA910 drive strength FAST using wrong value
        ARM: mmp: MMP2 drive strength FAST using wrong value
        ARM: pxa: fix recursive calls in pxa_low_gpio_chip
        AT91: Support for gsia18s board
        AT91: Acme Systems FOX Board G20 board files
        AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
        ARM: pxa: fix suspend/resume array index miscalculation
        ARM: pxa: use cpu_has_ipr() consistently in irq.c
        ARM: pxa: remove unused variable in clock-pxa3xx.c
        ARM: pxa: fix warning in zeus.c
        ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
        ARM mxs: clkdev related compile fixes
        ARM i.MX mx31_3ds: Fix MC13783 regulator names
        ARM: plat-stmp3xxx: irq_data conversion.
        ARM: plat-spear: irq_data conversion.
        ARM: plat-orion: irq_data conversion.
        ARM: plat-omap: irq_data conversion.
        ARM: plat-nomadik: irq_data conversion.
        ARM: plat-mxc: irq_data conversion.
        ...
      
      Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
      Buytenhek's irq_data conversion clashing with some omap irq updates)
      16c10203
    • L
      Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm · 65e5d002
      Linus Torvalds 提交于
      * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: fix missing branch in __error_a
        ARM: fix /proc/$PID/stack on SMP
        ARM: Fix build regression on SA11x0, PXA, and H720x targets
        ARM: 6625/1: use memblock memory regions for "System RAM" I/O resources
        ARM: fix wrongly patched constants
        ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP
        ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S
        ARM: 6622/1: fix dma_unmap_sg() documentation
        ARM: 6621/1: bitops: remove condition code clobber for CLZ
        ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used
        ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU
        ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero
        ARM: sched_clock: allow init_sched_clock() to be called early
        ARM: integrator: fix compile warning in cpu.c
        ARM: 6616/1: Fix ep93xx-fb init/exit annotations
        ARM: twd: fix display of twd frequency
        ARM: udelay: prevent math rounding resulting in short udelays
      65e5d002
  2. 15 1月, 2011 38 次提交