linux/arch/arm
Arnd Bergmann b8bc83971c Merge branch 'pxa/devel' into next/devel2
Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c
2011-10-30 20:59:09 +01:00
..
boot Merge branch 'samsung/devel' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into next/devel2 2011-10-20 14:51:38 +02:00
common ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUS 2011-10-15 11:04:22 +01:00
configs Merge branch 'samsung/devel' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into next/devel2 2011-10-20 14:51:38 +02:00
include/asm Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
kernel ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9 2011-10-15 11:04:22 +01:00
lib arm: remove "optimized" SHA1 routines 2011-08-07 14:07:03 -07:00
mach-at91 Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next/devel 2011-10-07 21:59:57 +02:00
mach-bcmring Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
mach-clps711x
mach-cns3xxx ARM: cns3xxx: Fix newly introduced warnings in the PCIe code 2011-09-09 23:33:34 +04:00
mach-davinci ARM: davinci: AM18x: Add wl1271/wlan support 2011-09-17 15:53:23 +05:30
mach-dove ARM: Dove: fix second SPI initialization call 2011-09-14 14:31:43 +02:00
mach-ebsa110
mach-ep93xx ARM: 6967/1: ep93xx: ts72xx: fix board model detection 2011-08-15 11:58:59 +01:00
mach-exynos4 ARM: EXYNOS4: Add support for M-5MOLS camera on Nuri board 2011-10-14 15:15:47 +09:00
mach-footbridge Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-08-29 16:34:07 -07:00
mach-gemini
mach-h720x Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
mach-imx Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next/devel 2011-10-07 21:59:57 +02:00
mach-integrator mach-integrator: fix VGA base regression 2011-09-20 22:58:41 +02:00
mach-iop13xx Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-iop32x Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-iop33x Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-ixp4xx Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-ixp23xx Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-ixp2000 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-kirkwood Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-ks8695 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mach-mmp ARM: mmp: register internal sram bank 2011-10-25 20:29:20 +08:00
mach-msm Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next 2011-08-01 15:16:05 +01:00
mach-mv78xx0 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-mx5 Merge branch 'imx/cleanup' into imx/devel 2011-10-07 21:57:31 +02:00
mach-mxs Merge branch 'imx/cleanup' into imx/devel 2011-10-07 21:57:31 +02:00
mach-netx
mach-nomadik ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
mach-nuc93x Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
mach-omap1 Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
mach-omap2 ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init 2011-09-30 11:05:55 -07:00
mach-orion5x ARM: mach-orion5x: add missing header file <linux/vga.h> 2011-08-25 09:08:18 -05:00
mach-pnx4008 Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
mach-prima2 ARM: CSR: add rtc i/o bridge interface for SiRFprimaII 2011-09-11 09:17:53 +08:00
mach-pxa Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-realview ARM: realview: ensure visibility of writes during reset 2011-08-12 15:40:57 +01:00
mach-rpc
mach-s3c64xx Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 2011-10-04 20:20:08 +09:00
mach-s3c2400/include/mach ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
mach-s3c2410 Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
mach-s3c2412 Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
mach-s3c2416 Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
mach-s3c2440 Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
mach-s3c2443 ARM: S3C2443: Remove redundant s3c_register_clocks call for init_clocks 2011-10-14 15:41:36 +09:00
mach-s5p64x0 ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
mach-s5pc100 Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 2011-10-04 20:20:08 +09:00
mach-s5pv210 ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
mach-sa1100 mach-sa1100: fix PCI build problem 2011-08-10 16:00:48 +00:00
mach-shark Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-shmobile Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x 2011-08-29 13:37:17 -07:00
mach-spear3xx ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
mach-spear6xx ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
mach-tcc8k
mach-tegra ARM: tegra: fix compilation error due to mach/hardware.h removal 2011-10-10 14:46:25 +12:00
mach-u300 Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mach-ux500 ARM: mach-ux500: enable fix for ARM errata 754322 2011-10-07 17:38:35 +02:00
mach-versatile Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-vexpress ARM: 7003/1: vexpress: Add clock definition for the SP805. 2011-08-24 09:45:21 +01:00
mach-vt8500
mach-w90x900 ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
mach-zynq ARM: zynq: remove incorrectly deleted file 2011-07-28 16:02:53 +00:00
mm ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGES 2011-10-01 17:49:18 +01:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'imx/cleanup' into imx/devel 2011-10-07 21:57:31 +02:00
plat-nomadik
plat-omap OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers 2011-09-06 13:19:58 -07:00
plat-orion
plat-pxa mmc: sdhci-pxa: move platform data to include/linux/platform_data 2011-07-20 17:20:52 -04:00
plat-s3c24xx ARM: S3C24XX: Add devname for hsmmc1 pclk 2011-10-14 15:35:08 +09:00
plat-s5p Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
plat-samsung ARM: S3C64XX: Fix SoC identification for S3C64xx devices 2011-10-18 08:39:57 +09:00
plat-spear Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
plat-tcc ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
plat-versatile
tools ARM: 7051/1: cpuimx* boards: fix mach-types errors 2011-08-22 15:57:22 +01:00
vfp Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
Kconfig Merge branch 'pxa/devel' into next/devel2 2011-10-30 20:59:09 +01:00
Kconfig-nommu
Kconfig.debug
Makefile ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs 2011-08-24 09:24:43 +02:00