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

powerpc: Trim defconfigs

2010-08-09 11:19:16 +10:00

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

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2010-08-05 09:03:46 -07:00

lib

…

math-emu

…

mm

kmap_atomic: make kunmap_atomic() harder to misuse

2010-08-09 20:44:54 -07:00

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

Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-06 13:18:29 -07:00

Kconfig.debug

…

Makefile

powerpc: fix build with make 3.82

2010-08-09 14:14:05 +10:00

relocs_check.pl

…