Russell King 988addf82e Merge branch 'origin' into devel-stable ... Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c		2010-03-08 20:21:04 +00:00
..
boot	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
common	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
configs	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
include/asm	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
kernel	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
lib
mach-aaec2000
mach-at91	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-bcmring
mach-clps711x
mach-davinci	Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci	2010-03-01 13:05:40 -08:00
mach-dove	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-ebsa110
mach-ep93xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
mach-footbridge	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-gemini	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
mach-h720x
mach-integrator	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
mach-iop13xx	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-iop32x	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-iop33x	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-ixp4xx	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-ixp23xx	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-ixp2000	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-kirkwood	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-ks8695
mach-l7200
mach-lh7a40x	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-loki	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-mmp	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-msm	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-mv78xx0	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-mx1	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-mx2	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-mx3	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-mx5	mx51_babbage: Fix ckih2 parameter in mx51_clocks_init function	2010-02-24 10:29:14 +01:00
mach-mx25	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-mxc91231	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-netx
mach-nomadik	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
mach-ns9xxx	Merge branch 'misc2' into devel	2010-02-25 22:09:41 +00:00
mach-nuc93x
mach-omap1	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
mach-omap2	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-03-02 10:41:26 -08:00
mach-orion5x	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-pnx4008	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
mach-pxa	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-realview	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
mach-rpc
mach-s3c24a0/include/mach	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-s3c64xx	Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable	2010-03-08 16:08:46 +00:00
mach-s3c2400
mach-s3c2410	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-s3c2412	ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed	2010-02-21 23:10:35 +00:00
mach-s3c2440	ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support	2010-03-04 23:14:44 +00:00
mach-s3c2443	ARM: Merge next-samsung-s3c2443-clock	2010-03-07 22:56:19 +00:00
mach-s5p6440	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00
mach-s5p6442	ARM: S5P6442: Add SMDK6442 board support file	2010-02-24 01:52:18 +00:00
mach-s5pc100	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-s5pv210	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-sa1100	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
mach-shark
mach-shmobile	ARM: mach-shmobile: ap4evb: Add KEYSC support	2010-02-25 16:58:34 +09:00
mach-stmp37xx
mach-stmp378x
mach-u300	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-03-04 08:20:14 -08:00
mach-ux500	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
mach-versatile	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
mach-w90x900	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
mm	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
nwfpe
oprofile
plat-iop
plat-mxc	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
plat-nomadik	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
plat-omap	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-03-02 10:41:26 -08:00
plat-orion
plat-pxa
plat-s3c24xx	ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support	2010-03-04 23:14:44 +00:00
plat-s5p	ARM: S5PV210: Update Kconfig and Makefiles	2010-02-24 22:47:23 +00:00
plat-s5pc1xx
plat-samsung	ARM: S3C64XX: Add AC97 platform resources	2010-02-24 02:01:40 +00:00
plat-stmp3xxx	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
tools	ARM: Update mach-types	2010-02-20 14:17:16 +00:00
vfp	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
Kconfig	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
Kconfig-nommu
Kconfig.debug	ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx	2010-02-24 01:52:06 +00:00
Makefile	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00