luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e4862f2f6f
tmp_suning_uos_patched/arch
History
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
..
alpha defconfig reduction 2010-08-14 22:26:53 +02:00
arm Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
avr32 defconfig reduction 2010-08-14 22:26:53 +02:00
blackfin Merge git://git.infradead.org/mtd-2.6 2010-08-15 17:32:47 -07:00
cris defconfig reduction 2010-08-14 22:26:53 +02:00
frv defconfig reduction 2010-08-14 22:26:53 +02:00
h8300 defconfig reduction 2010-08-14 22:26:53 +02:00
ia64 defconfig reduction 2010-08-14 22:26:53 +02:00
m32r defconfig reduction 2010-08-14 22:26:53 +02:00
m68k defconfig reduction 2010-08-14 22:26:53 +02:00
m68knommu defconfig reduction 2010-08-14 22:26:53 +02:00
microblaze defconfig reduction 2010-08-14 22:26:53 +02:00
mips Merge git://git.infradead.org/mtd-2.6 2010-08-15 17:32:47 -07:00
mn10300 defconfig reduction 2010-08-14 22:26:53 +02:00
parisc defconfig reduction 2010-08-14 22:26:53 +02:00
powerpc Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
s390 defconfig reduction 2010-08-14 22:26:53 +02:00
score defconfig reduction 2010-08-14 22:26:53 +02:00
sh defconfig reduction 2010-08-14 22:26:53 +02:00
sparc defconfig reduction 2010-08-14 22:26:53 +02:00
tile Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2010-08-15 17:31:43 -07:00
um Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
x86 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2010-08-15 17:37:07 -07:00
xtensa Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00