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
..
boot	Merge branch 'master' into for-next	2010-06-16 18:08:13 +02:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-12-14 17:34:00 -08:00
kernel	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
lib	sparc64: Make lock backoff really a NOP on UP builds.	2010-08-18 22:53:26 -07:00
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-10-29 08:03:48 -07:00
oprofile
prom	sparc: Write to prom console using indirect buffer.	2010-11-30 20:15:58 -08:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-10-29 08:03:48 -07:00
Kconfig.debug	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
Makefile