Paul Mundt f0a217a31a Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest ... Conflicts: arch/arm/mach-shmobile/Kconfig arch/arm/mach-shmobile/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2012-01-10 17:10:55 +09:00
..
boot	Changes queued in gpio/next for the start of the 3.3 merge window	2012-01-07 12:15:36 -08:00
common	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
configs	Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest	2012-01-10 17:10:55 +09:00
include/asm	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
kernel	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
lib	ARM: lib: add call_with_stack function for safely changing stack	2011-12-12 16:07:35 +00:00
mach-at91	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-bcmring	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-clps711x	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-cns3xxx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-davinci	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-dove	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ebsa110	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ep93xx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-exynos	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-footbridge	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-gemini	ARM: big removal of now unused vmalloc.h files	2011-11-26 19:21:29 -05:00
mach-h720x	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-highbank	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-imx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-integrator	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-iop13xx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-iop32x	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-iop33x	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ixp4xx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ixp23xx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ixp2000	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-kirkwood	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ks8695	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08: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 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-mmp	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-msm	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
mach-mv78xx0	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-mx5	ARM: restart: mxc: use new restart hook	2012-01-05 12:57:15 +00:00
mach-mxs	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-netx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-nomadik	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-omap1	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-omap2	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-orion5x	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-picoxcell	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-pnx4008	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-prima2	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-pxa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
mach-realview	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-rpc	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-s3c64xx	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
mach-s3c2410	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s3c2412	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s3c2416	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s3c2440	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s3c2443	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s5p64x0	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s5pc100	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-s5pv210	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-sa1100	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-shark	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-shmobile	Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest	2012-01-10 17:10:55 +09:00
mach-spear3xx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-spear6xx	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-tegra	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-u300	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-ux500	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-versatile	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-vexpress	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-vt8500	ARM: big removal of now unused vmalloc.h files	2011-11-26 19:21:29 -05:00
mach-w90x900	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
mach-zynq	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mm	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2012-01-06 18:15:25 -08:00
nwfpe	ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe.	2011-12-13 08:52:02 +00:00
oprofile	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
plat-iop	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
plat-mxc	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
plat-nomadik	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00
plat-omap	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
plat-orion	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
plat-pxa	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
plat-s3c24xx	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
plat-s5p	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08:00
plat-samsung	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
plat-spear	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
plat-versatile	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00
tools	ARM: Update mach-types	2011-12-23 22:58:10 +00:00
vfp	arm: remove several unnecessary module.h include instances	2011-10-31 19:30:48 -04:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
Kconfig-nommu	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.debug	Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 21:08:03 -07:00
Makefile	arm: Remove TCC subarch from Kconfig/Makefile	2012-01-05 13:33:59 +01:00