Arnd Bergmann abc3f126ac Merge branch 'imx/imx6q' into next/soc ... Conflicts: Documentation/devicetree/bindings/arm/fsl.txt arch/arm/Kconfig arch/arm/Kconfig.debug arch/arm/plat-mxc/include/mach/common.h		2011-11-02 02:46:55 +01:00
..
boot	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
common	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
configs	Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel	2011-10-20 15:14:25 +02:00
include/asm	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
kernel	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
lib	arm: remove "optimized" SHA1 routines	2011-08-07 14:07:03 -07:00
mach-at91	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-bcmring	ARM: mach-bcmring: remove mach/memory.h	2011-10-13 12:49:48 -04:00
mach-clps711x	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
mach-cns3xxx	Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable	2011-10-18 13:40:54 +01:00
mach-davinci	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-dove	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-ebsa110	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-ep93xx	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-exynos4	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-footbridge	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-gemini	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-h720x	ARM: mach-h720x: remove mach/memory.h	2011-10-13 12:49:45 -04:00
mach-highbank	ARM: highbank: add suspend support	2011-10-31 14:14:05 +01:00
mach-imx	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
mach-integrator	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-iop13xx	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
mach-iop32x	ARM: mach-iop32x: remove mach/memory.h	2011-10-13 12:49:32 -04:00
mach-iop33x	ARM: mach-iop33x: remove mach/memory.h	2011-09-26 10:12:04 -04:00
mach-ixp4xx	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-ixp23xx	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
mach-ixp2000	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-kirkwood	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-ks8695	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-l7200/include/mach	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
mach-lpc32xx	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-mmp	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-msm	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-mv78xx0	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-mx5	Merge branch 'imx/devel' into next/dt	2011-11-01 17:12:22 +01:00
mach-mxs	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
mach-netx	ARM: mach-netx: remove mach/memory.h	2011-10-13 12:49:35 -04:00
mach-nomadik	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-nuc93x	ARM: mach-nuc93x: remove mach/memory.h	2011-10-13 12:49:40 -04:00
mach-omap1	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-omap2	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-orion5x	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-picoxcell	picoxcell: add a definition of VMALLOC_END	2011-10-04 21:25:10 +01:00
mach-pnx4008	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-prima2	Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable	2011-10-18 13:40:54 +01:00
mach-pxa	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-realview	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
mach-rpc	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-s3c64xx	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-s3c2410	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-s3c2412	Merge branch 'dt/gic' into next/dt	2011-10-31 14:08:10 +01:00
mach-s3c2416	Merge branch 'dt/gic' into next/dt	2011-10-31 14:08:10 +01:00
mach-s3c2440	Merge branch 'dt/gic' into next/dt	2011-10-31 14:08:10 +01:00
mach-s3c2443	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-s5p64x0	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-s5pc100	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-s5pv210	Merge branch 'depends/rmk/devel-stable' into imx/imx6q	2011-10-31 14:23:28 +01:00
mach-sa1100	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-shark	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
mach-shmobile	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-spear3xx	ARM: spear: remove mach/memory.h and plat/memory.h	2011-10-13 12:49:38 -04:00
mach-spear6xx	ARM: spear: remove mach/memory.h and plat/memory.h	2011-10-13 12:49:38 -04:00
mach-tcc8k	ARM: mach-tcc8k: convert boot_params to atag_offset	2011-08-21 17:15:15 -04:00
mach-tegra	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-u300	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-ux500	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
mach-versatile	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-vexpress	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-vt8500	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-w90x900	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
mach-zynq	ARM: mach-zynq: remove mach/memory.h	2011-10-13 12:49:49 -04:00
mm	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
nwfpe
oprofile	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-02-15 10:18:48 -08:00
plat-iop	ARM: convert PCI defines to variables	2011-07-12 11:19:29 -05:00
plat-mxc	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
plat-nomadik	ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>	2011-08-23 15:30:04 +01:00
plat-omap	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
plat-orion	ARM: 7063/1: Orion: gpio: add missing include of linux/types.h	2011-08-24 08:29:20 +01:00
plat-pxa	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
plat-s3c24xx	Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-25 12:43:28 -07:00
plat-s5p	ARM: S5P: fix offset calculation on gpio-interrupt	2011-10-21 18:05:02 +09:00
plat-samsung	Merge branch 'cross-platform/debug_ll' into imx/imx6q	2011-10-31 14:24:41 +01:00
plat-spear	Merge branch 'dt/gic' into highbank/soc	2011-10-31 14:11:34 +01:00
plat-tcc	ARM: plat-tcc: remove mach/memory.h	2011-10-13 12:49:42 -04:00
plat-versatile	ARM: consolidate SMP cross call implementation	2011-05-23 16:53:17 +01:00
tools	ARM: 7051/1: cpuimx* boards: fix mach-types errors	2011-08-22 15:57:22 +01:00
vfp	ARM: vfp: Fix the comment to make it consistent with the code.	2011-09-23 12:05:30 +05:30
Kconfig	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
Kconfig-nommu	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.debug	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00
Makefile	Merge branch 'imx/imx6q' into next/soc	2011-11-02 02:46:55 +01:00