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
..
amiga	m68k: amiga - RTC platform device conversion	2010-05-26 19:51:10 +02:00
apollo	m68k: apollo core - Kill warn_unused_result warnings	2009-01-12 20:56:35 +01:00
atari	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
bvme6000	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
fpsp040
hp300	m68k: hp300 - Checkpatch cleanup	2010-05-17 21:15:40 +02:00
ifpsp060	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
include/asm	m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h	2010-11-03 11:30:07 +10:00
kernel	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
lib
mac	fix comment typos concerning "consistent"	2010-12-10 16:04:28 +01:00
math-emu	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
mm	m68k: invoke oom-killer from page fault	2010-05-17 21:37:39 +02:00
mvme16x	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
mvme147	m68k: mvme147 core - Kill warn_unused_result warnings	2009-01-12 20:56:37 +01:00
q40	Update broken web addresses in arch directory.	2010-10-18 11:03:21 +02:00
sun3	m68k/m68knommu: Remove dead SMP config option	2010-10-22 09:43:23 +02:00
sun3x	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
tools/amiga
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	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
Kconfig.debug
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00