OpenCloudOS-Kernel/arch
Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next
Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.
2010-12-22 18:57:02 +01:00
..
alpha Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
arm Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
avr32 suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
blackfin Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
cris tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
frv BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
h8300 Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
ia64 Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
m32r Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
m68k Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
m68knommu BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
microblaze Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
mips Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
mn10300 clarify a usage constraint for cnt32_to_63() 2010-12-20 09:07:35 -08:00
parisc parisc: convert the rest of the irq handlers to simple/percpu 2010-12-04 11:15:19 -05:00
powerpc Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
s390 [S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus 2010-12-01 10:08:17 +01:00
score Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
sh Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
sparc Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
tile arch/tile: handle rt_sigreturn() more cleanly 2010-12-17 16:59:29 -05:00
um uml: disable winch irq before freeing handler data 2010-11-25 06:50:39 +09:00
x86 Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
xtensa Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
.gitignore
Kconfig jump label: Add work around to i386 gcc asm goto bug 2010-10-29 14:45:29 -04:00