Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6205/1: perf: ensure counter delta is treated as unsigned ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220 ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220 ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore ARM: 6193/1: RealView: Align the machine_desc.phys_io to 1MB section ARM: 6192/1: VExpress: Align the machine_desc.phys_io to 1MB section ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance workaround ARM: 6187/1: The v6_dma_inv_range() function must preserve data on SMP ARM: 6186/1: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI [ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA [ARM] pxa/mioa701: fix camera regression [ARM] pxa/z2: fix flash layout to final version [ARM] pxa/z2: fix missing include in battery driver [ARM] pxa: fix incorrect gpio type in udc_pxa2xx.h
Showing
- arch/arm/Kconfig 2 additions, 1 deletionarch/arm/Kconfig
- arch/arm/include/asm/mach/udc_pxa2xx.h 2 additions, 2 deletionsarch/arm/include/asm/mach/udc_pxa2xx.h
- arch/arm/include/asm/processor.h 4 additions, 0 deletionsarch/arm/include/asm/processor.h
- arch/arm/kernel/perf_event.c 1 addition, 1 deletionarch/arm/kernel/perf_event.c
- arch/arm/mach-mx3/mach-mx31lilly.c 22 additions, 11 deletionsarch/arm/mach-mx3/mach-mx31lilly.c
- arch/arm/mach-pxa/mioa701.c 1 addition, 1 deletionarch/arm/mach-pxa/mioa701.c
- arch/arm/mach-pxa/z2.c 10 additions, 16 deletionsarch/arm/mach-pxa/z2.c
- arch/arm/mach-realview/Kconfig 2 additions, 0 deletionsarch/arm/mach-realview/Kconfig
- arch/arm/mach-realview/include/mach/barriers.h 8 additions, 0 deletionsarch/arm/mach-realview/include/mach/barriers.h
- arch/arm/mach-realview/realview_eb.c 2 additions, 1 deletionarch/arm/mach-realview/realview_eb.c
- arch/arm/mach-realview/realview_pb1176.c 2 additions, 1 deletionarch/arm/mach-realview/realview_pb1176.c
- arch/arm/mach-realview/realview_pb11mp.c 2 additions, 1 deletionarch/arm/mach-realview/realview_pb11mp.c
- arch/arm/mach-realview/realview_pba8.c 2 additions, 1 deletionarch/arm/mach-realview/realview_pba8.c
- arch/arm/mach-realview/realview_pbx.c 2 additions, 1 deletionarch/arm/mach-realview/realview_pbx.c
- arch/arm/mach-vexpress/ct-ca9x4.c 2 additions, 1 deletionarch/arm/mach-vexpress/ct-ca9x4.c
- arch/arm/mm/Kconfig 21 additions, 0 deletionsarch/arm/mm/Kconfig
- arch/arm/mm/cache-v6.S 14 additions, 4 deletionsarch/arm/mm/cache-v6.S
- arch/arm/mm/dma-mapping.c 9 additions, 9 deletionsarch/arm/mm/dma-mapping.c
- arch/arm/plat-pxa/Makefile 2 additions, 1 deletionarch/arm/plat-pxa/Makefile
- drivers/power/z2_battery.c 3 additions, 9 deletionsdrivers/power/z2_battery.c
Loading
Please register or sign in to comment