Russell King 4073723acb Merge branch 'misc' into devel ... Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c		2011-01-06 22:32:52 +00:00
..
boot	Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel	2011-01-05 18:08:10 +00:00
common	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
configs
include/asm	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
kernel	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
lib	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
mach-aaec2000
mach-at91	Merge branch 'clksrc' into devel	2011-01-05 18:09:03 +00:00
mach-bcmring	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-clps711x
mach-cns3xxx	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-davinci	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-dove
mach-ebsa110
mach-ep93xx	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
mach-footbridge
mach-gemini
mach-h720x
mach-imx	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
mach-integrator	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-iop13xx	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-iop32x
mach-iop33x
mach-ixp4xx	Merge branch 'clksrc' into devel	2011-01-05 18:09:03 +00:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695	ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()	2011-01-03 11:27:43 +00:00
mach-l7200/include/mach
mach-lh7a40x
mach-loki
mach-lpc32xx	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-mmp	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-msm	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-mv78xx0
mach-mx3	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
mach-mx5
mach-mx25	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
mach-mxc91231
mach-netx
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-omap2	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-orion5x
mach-pnx4008	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
mach-pxa	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-realview	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx
mach-s3c2400
mach-s3c2410
mach-s3c2412	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-s3c2416
mach-s3c2440
mach-s3c2443
mach-s5p64x0
mach-s5p6442
mach-s5pc100
mach-s5pv210
mach-s5pv310	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-sa1100	Merge branch 'clksrc' into devel	2011-01-05 18:09:03 +00:00
mach-shark
mach-shmobile	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-tcc8k	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-tegra	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-u300	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-ux500	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-versatile	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-vexpress	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mach-w90x900	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
mm	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
nwfpe
oprofile
plat-iop	Merge branch 'clksrc' into devel	2011-01-05 18:09:03 +00:00
plat-mxc
plat-nomadik
plat-omap	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
plat-orion
plat-pxa
plat-s3c24xx
plat-s5p
plat-samsung
plat-spear	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
plat-stmp3xxx	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
plat-tcc
plat-versatile	Merge branch 'clksrc' into devel	2011-01-05 18:09:03 +00:00
tools
vfp	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
Kconfig	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
Kconfig-nommu
Kconfig.debug	Merge branch 'misc' into devel	2011-01-06 22:32:52 +00:00
Makefile