Linus Torvalds 3127f23f01 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... Pull m68k updates from Geert Uytterhoeven. Fix up trivial conflict (m68k switched to generic version of uapi/asm/socket.h, net tree updated the old one) as per Geert. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/sun3: Fix instruction faults m68k/sun3: Get interrupts working again m68k: move to a single instance of free_initmem() m68k: merge MMU and non-MMU versions of mm/init.c m68k: switch to using the asm-generic termios.h m68k: switch to using the asm-generic termbits.h m68k: switch to using the asm-generic sockios.h m68k: switch to using the asm-generic socket.h m68k: switch to using the asm-generic shmbuf.h m68k: switch to using the asm-generic sembuf.h m68k: switch to using the asm-generic msgbuf.h m68k: switch to using the asm-generic auxvec.h m68k: switch to using the asm-generic shmparam.h m68k: switch to using the asm-generic spinlock.h m68k: switch to using the asm-generic hw_irq.h arch/m68k: remove CONFIG_EXPERIMENTAL		2012-12-13 13:23:33 -08:00
..
amiga	m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR	2012-08-18 15:15:57 +02:00
apollo	m68k/apollo: Rename "timer" to "apollo_timer"	2012-07-22 16:55:49 +02:00
atari	m68k/atari: Change VME irq numbers from unsigned long to unsigned int	2012-04-22 20:16:49 +02:00
bvme6000	Disintegrate asm/system.h for M68K	2012-03-28 18:30:02 +01:00
configs	netfilter: remove xt_NOTRACK	2012-09-03 13:36:40 +02:00
emu	TTY: call tty_port_destroy in the rest of drivers	2012-11-15 17:20:58 -08:00
fpsp040	Fix common misspellings	2011-03-31 11:26:23 -03:00
hp300	Disintegrate asm/system.h for M68K	2012-03-28 18:30:02 +01:00
ifpsp060	Fix common misspellings	2011-03-31 11:26:23 -03:00
include	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-12-13 13:23:33 -08:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-12-13 13:23:33 -08:00
lib	m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64	2012-06-10 10:18:30 +02:00
mac	m68k/mac: Add missing platform check before registering platform devices	2012-04-01 22:57:51 +02:00
math-emu	Fix misspellings of "whether" in comments.	2012-11-19 14:31:35 +01:00
mm	m68k: move to a single instance of free_initmem()	2012-11-14 08:50:56 +01:00
mvme16x	Disintegrate asm/system.h for M68K	2012-03-28 18:30:02 +01:00
mvme147	Disintegrate asm/system.h for M68K	2012-03-28 18:30:02 +01:00
platform	m68knommu: clean up ColdFire 54xx General Timer definitions	2012-09-27 23:34:03 +10:00
q40	m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR	2012-08-18 15:15:58 +02:00
sun3	m68k/sun3: Get interrupts working again	2012-11-14 08:50:57 +01:00
sun3x	Disintegrate asm/system.h for M68K	2012-03-28 18:30:02 +01: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: switch to saner kernel_execve() semantics	2012-10-17 02:29:27 -04:00
Kconfig.bus	arch/m68k: remove CONFIG_EXPERIMENTAL	2012-11-14 08:50:54 +01:00
Kconfig.cpu	arch/m68k: remove CONFIG_EXPERIMENTAL	2012-11-14 08:50:54 +01:00
Kconfig.debug	arch/m68k: remove CONFIG_EXPERIMENTAL	2012-11-14 08:50:54 +01:00
Kconfig.devices	arch/m68k: remove CONFIG_EXPERIMENTAL	2012-11-14 08:50:54 +01:00
Kconfig.machine	m68k/Kconfig: Separate classic m68k and coldfire early	2011-12-30 10:20:49 +10:00
Makefile	m68knommu: Add support for the Coldfire m5441x.	2012-07-16 09:59:21 +10:00