linux-stable-rt/arch/powerpc
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
boot Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
configs
include/asm Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
kernel Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
kvm
lib
math-emu
mm
oprofile
platforms Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
sysdev Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
xmon
Kconfig
Kconfig.debug
Makefile
relocs_check.pl