Len Brown d0e323b470 Merge branch 'apei' into apei-release ...

Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.

	arch/ia64/Kconfig
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	lib/Kconfig
	lib/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>

2011-08-03 11:30:42 -04:00

..

amiga

m68k/amiga: Chip RAM - Use lookup_resource()

2011-07-30 21:21:39 +02:00

apollo

m68k: apollo core - Kill warn_unused_result warnings

2009-01-12 20:56:35 +01:00

atari

m68k/atari: Reserve some ST-RAM early on for device buffer use

2011-07-30 21:21:39 +02:00

bvme6000

m68k: Switch do_timer() to xtime_update()

2011-01-31 14:55:46 +01:00

configs

m68k: merge m68k and m68knommu arch directories

2011-03-25 14:05:13 +10:00

emu

net: m68k/nfeth: Remove wrong usage of dev->flags

2011-07-14 14:38:17 -07:00

fpsp040

Fix common misspellings

2011-03-31 11:26:23 -03:00

hp300

m68k: hp300 - Checkpatch cleanup

2010-05-17 21:15:40 +02:00

ifpsp060

Fix common misspellings

2011-03-31 11:26:23 -03:00

include/asm

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2011-07-31 14:30:59 -10:00

kernel

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2011-07-31 14:30:59 -10:00

lib

m68k: merge and clean up delay.h files

2011-07-25 11:20:41 +10:00

mac

fix comment typos concerning "consistent"

2010-12-10 16:04:28 +01:00

math-emu

m68k/math-emu: Remove unnecessary code

2011-07-30 21:21:40 +02:00

mm

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2011-07-31 14:30:59 -10:00

mvme16x

m68k: Switch do_timer() to xtime_update()

2011-01-31 14:55:46 +01:00

mvme147

m68k: Switch do_timer() to xtime_update()

2011-01-31 14:55:46 +01:00

platform

m68k: Revive reporting of spurious interrupts

2011-07-25 11:20:41 +10:00

q40

Fix common misspellings

2011-03-31 11:26:23 -03:00

sun3

m68k: Switch do_timer() to xtime_update()

2011-01-31 14:55:46 +01: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

Convert files to UTF-8 and some cleanups

2007-10-19 23:21:04 +02:00

install.sh

kbuild: use INSTALLKERNEL to select customized installkernel script

2009-09-20 12:18:14 +02:00

Kconfig

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

Kconfig.debug

m68k: merge m68k and m68knommu arch directories

2011-03-25 14:05:13 +10:00

Kconfig.mmu

m68k/atari: Reserve some ST-RAM early on for device buffer use

2011-07-30 21:21:39 +02:00

Kconfig.nommu

m68k: merge mmu and non-mmu bitops.h

2011-07-25 11:20:40 +10:00

Makefile

m68k: merge m68k and m68knommu arch directories

2011-03-25 14:05:13 +10:00

Makefile_mm

m68k: merge m68k and m68knommu arch directories

2011-03-25 14:05:13 +10:00

Makefile_no

m68knommu: merge ColdFire 5206 and 5206e platform code

2011-07-25 11:20:41 +10:00