Paul Mundt a6b5825aa7 Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux ... Conflicts: drivers/video/omap2/dss/dsi.c drivers/video/omap2/dss/dss_features.c drivers/video/omap2/dss/dss_features.h Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-05-24 15:35:54 +09:00
..
boot	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
common	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
configs	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
include/asm	Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus	2011-05-23 19:27:40 +01:00
kernel	Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus	2011-05-23 19:27:40 +01:00
lib
mach-at91	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mach-bcmring	ARM: bcmring: convert to use sp804 clockevents	2011-05-23 18:04:54 +01:00
mach-clps711x
mach-cns3xxx
mach-davinci	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
mach-dove
mach-ebsa110
mach-ep93xx
mach-exynos4	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-imx
mach-integrator	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200/include/mach
mach-loki
mach-lpc32xx	clocksource: convert ARM 32-bit up counting clocksources	2011-05-23 18:04:51 +01:00
mach-mmp
mach-msm	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
mach-mv78xx0
mach-mx5
mach-mxs	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
mach-netx	clocksource: convert ARM 32-bit up counting clocksources	2011-05-23 18:04:51 +01:00
mach-nomadik
mach-nuc93x
mach-omap1	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-omap2	Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux	2011-05-24 15:35:54 +09:00
mach-orion5x
mach-pnx4008
mach-pxa	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
mach-realview	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
mach-s3c2400
mach-s3c2410	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
mach-s3c2412
mach-s3c2416	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
mach-s3c2440
mach-s3c2443
mach-s5p64x0
mach-s5p6442
mach-s5pc100
mach-s5pv210
mach-sa1100	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-shark
mach-shmobile	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-spear3xx	ARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in	2011-05-20 22:34:25 +01:00
mach-spear6xx	ARM: 6934/1: SPEAr6xx: Rework Kconfig for single image solution	2011-05-20 22:34:25 +01:00
mach-tcc8k	clocksource: convert ARM 32-bit up counting clocksources	2011-05-23 18:04:51 +01:00
mach-tegra	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
mach-u300	clocksource: convert ARM 32-bit up counting clocksources	2011-05-23 18:04:51 +01:00
mach-ux500	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
mach-versatile	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-vexpress	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
mach-vt8500
mach-w90x900	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
mm	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
nwfpe
oprofile
plat-iop
plat-mxc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
plat-nomadik	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
plat-omap	Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux	2011-05-24 15:35:54 +09:00
plat-orion	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
plat-pxa
plat-s3c24xx	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
plat-s5p	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
plat-samsung	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
plat-spear	Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus	2011-05-23 19:27:40 +01:00
plat-tcc
plat-versatile	ARM: consolidate SMP cross call implementation	2011-05-23 16:53:17 +01:00
tools
vfp
Kconfig	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
Kconfig-nommu
Kconfig.debug
Makefile	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00