Linus Torvalds 356b95424c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits) m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac m68k/serial: Remove references to obsolete serial config options m68k/net: Remove obsolete IRQ_FLG_* users m68k: Don't comment out syscalls used by glibc m68k/atari: Move declaration of atari_SCC_reset_done to header file m68k/serial: Remove references to obsolete CONFIG_SERIAL167 m68k/hp300: Export hp300_ledstate m68k: Initconst section fixes m68k/mac: cleanup macro case mac_scsi: fix mac_scsi on some powerbooks m68k/mac: fix powerbook 150 adb_type m68k/mac: fix baboon irq disable and shutdown m68k/mac: oss irq fixes m68k/mac: fix nubus slot irq disable and shutdown m68k/mac: enable via_alt_mapping on performa 580 m68k/mac: cleanup forward declarations m68k/mac: cleanup mac_irq_pending m68k/mac: cleanup mac_clear_irq m68k/mac: early console m68k/mvme16x: Add support for EARLY_PRINTK ... Fix up trivial conflict in arch/m68k/Kconfig.debug due to new EARLY_PRINTK config option addition clashing with movement of the BOOTPARAM options.		2012-01-06 18:28:12 -08:00
..
amiga	m68k/irq: Remove obsolete m68k irq framework	2011-11-08 22:35:52 +01:00
apollo	m68k/irq: Remove obsolete support for user vector interrupt fixups	2011-11-08 22:35:52 +01:00
atari	m68k/atari: Move declaration of atari_SCC_reset_done to header file	2011-12-10 19:52:49 +01:00
bvme6000	m68k/irq: Remove obsolete support for user vector interrupt fixups	2011-11-08 22:35:52 +01:00
configs	m68k/serial: Remove references to obsolete serial config options	2011-12-28 20:14:41 +01:00
emu	m68k: Initconst section fixes	2011-12-10 19:52:48 +01:00
fpsp040	Fix common misspellings	2011-03-31 11:26:23 -03:00
hp300	m68k/hp300: Export hp300_ledstate	2011-12-10 19:52:48 +01: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	2012-01-06 18:28:12 -08:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-06 18:28:12 -08:00
lib	m68k: modify user space access functions to support ColdFire CPUs	2011-12-30 10:20:21 +10:00
mac	m68k/mac: cleanup macro case	2011-12-10 19:52:48 +01:00
math-emu	m68k/math-emu: Remove unnecessary code	2011-07-30 21:21:40 +02:00
mm	m68k: add ColdFire with MMU enabled support to the m68k mem init code	2011-12-30 10:20:48 +10:00
mvme16x	m68k/mvme16x: Add support for EARLY_PRINTK	2011-12-10 19:52:45 +01:00
mvme147	m68k/irq: Remove obsolete support for user vector interrupt fixups	2011-11-08 22:35:52 +01:00
platform	m68k: set register a2 to current if MMU enabled on ColdFire	2011-12-30 10:20:24 +10:00
q40	m68k/irq: Remove obsolete m68k irq framework	2011-11-08 22:35:52 +01:00
sun3	m68k/irq: Remove obsolete support for user vector interrupt fixups	2011-11-08 22:35:52 +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	m68k: ColdFire with MMU enabled uses same clocking code as non-MMU	2011-12-30 10:20:43 +10:00
Kconfig.bus	m68k: Revive lost DIO bus config option	2011-11-08 22:35:46 +01:00
Kconfig.cpu	m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled	2011-12-30 10:20:50 +10:00
Kconfig.debug	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-06 18:28:12 -08:00
Kconfig.devices	m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac	2012-01-04 22:23:50 +01:00
Kconfig.machine	m68k/Kconfig: Separate classic m68k and coldfire early	2011-12-30 10:20:49 +10:00
Makefile	m68k: merge mmu and non-mmu arch Makefiles	2011-10-18 14:22:25 +10:00