Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus ... Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-15 21:55:59 +02:00
..
boot	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-07-14 16:06:58 -07:00
common	[ARM] Merge most of the PXA work for initial merge	2008-07-14 23:34:46 +01:00
configs	[ARM] Merge most of the PXA work for initial merge	2008-07-14 23:34:46 +01:00
kernel	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
lib
mach-aaec2000
mach-at91	Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel	2008-07-10 16:38:50 +01:00
mach-clps711x
mach-clps7500
mach-davinci
mach-ebsa110
mach-ep93xx	[ARM] 5171/1: ep93xx: fix compilation of modules using clocks	2008-07-10 14:50:21 +01:00
mach-footbridge
mach-h720x
mach-imx	Merge branch 'imx' into devel	2008-07-10 16:41:50 +01:00
mach-integrator	Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel	2008-07-10 16:38:50 +01:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx	[ARM] Merge most of the PXA work for initial merge	2008-07-14 23:34:46 +01:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200
mach-lh7a40x
mach-loki
mach-msm
mach-mv78xx0
mach-mx2	i.MX27 family: Add the Phytec PCM970 evaluation board	2008-07-05 10:03:01 +02:00
mach-mx3	MX3: Adapt mx31lite to new timer init style	2008-07-05 10:02:53 +02:00
mach-netx
mach-ns9xxx
mach-omap1	Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel	2008-07-10 16:38:50 +01:00
mach-omap2	Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel	2008-07-10 16:38:50 +01:00
mach-orion5x	[ARM] Orion: LED support for HP mv2120	2008-07-07 18:38:24 -04:00
mach-pnx4008
mach-pxa	[ARM] Merge most of the PXA work for initial merge	2008-07-14 23:34:46 +01:00
mach-realview
mach-rpc
mach-s3c2400
mach-s3c2410	[ARM] Acer n30: Minor style and indentation fixes.	2008-07-07 18:13:05 +01:00
mach-s3c2412	[ARM] S3C2412: Correct parents for EREFCLK and UREFCLK	2008-07-03 16:51:30 +01:00
mach-s3c2440	[ARM] AT2440EVB: Add DM9000A network controller support.	2008-07-07 18:13:01 +01:00
mach-s3c2442
mach-s3c2443	[ARM] S3C2443: Add prediv clk and fix setting of h and p clocks	2008-07-07 18:13:02 +01:00
mach-sa1100
mach-shark
mach-versatile
mm	Merge branch 'imx' into devel	2008-07-10 16:41:50 +01:00
nwfpe
oprofile
plat-iop	[ARM] 5160/1: IOP3XX: gpio/gpiolib support	2008-07-09 23:31:42 +01:00
plat-mxc	i.MX2 family: Add basic mach support	2008-07-05 10:03:02 +02:00
plat-omap
plat-orion
plat-s3c
plat-s3c24xx	[ARM] S3C24XX: PWM API support.	2008-07-03 16:51:30 +01:00
tools	[ARM] mach-types update	2008-07-07 16:26:14 +01:00
vfp
Kconfig	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
Kconfig-nommu
Kconfig.debug
Makefile	Merge branch 'imx' into devel	2008-07-10 16:41:50 +01:00