android_kernel_xiaomi_sm8350/arch/m68k
Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6
Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2009-06-12 11:32:58 +02:00
..
amiga
apollo
atari m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
bvme6000
configs m68k: Update defconfigs for 2.6.30-rc3 2009-04-22 20:55:12 +02:00
fpsp040
hp300
ifpsp060
include/asm asm-generic: merge branch 'master' of torvalds/linux-2.6 2009-06-12 11:32:58 +02:00
kernel m68k: arch/m68k/kernel/sun3-head.S needs <linux/init.h> 2009-04-28 16:07:18 -07:00
lib
mac m68k: mac - Add SWIM floppy support 2009-03-26 21:15:27 +01:00
math-emu
mm
mvme16x
mvme147
q40
sun3
sun3x
tools/amiga
install.sh m68k: Add install target 2009-03-26 21:15:26 +01:00
Kconfig
Kconfig.debug
Makefile m68k: Add install target 2009-03-26 21:15:26 +01:00