David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	include/asm-x86/statfs.h

2008-10-13 17:13:56 +01:00

..

amiga

PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures

2008-07-24 10:47:21 -07:00

apollo

m68k: missing __init

2007-07-20 08:24:49 -07:00

atari

m68k: atari_keyb_init operator precedence fix

2008-09-02 10:57:52 -07:00

bvme6000

bvme6000-rtc: BKL pushdown

2008-06-20 14:05:55 -06:00

configs

m68k: Update defconfigs for 2.6.27-rc6

2008-09-10 14:15:29 -07:00

fpsp040

Stringify support commas

2008-07-20 17:24:38 -07:00

hp300

m68k: kill arch/m68k/hp300/ksyms.c

2008-02-05 09:44:23 -08:00

ifpsp060

Stringify support commas

2008-07-20 17:24:38 -07:00

kernel

m68k{,nommu}: Wire up new system calls

2008-08-11 10:37:34 -07:00

lib

Stringify support commas

2008-07-20 17:24:38 -07:00

mac

remove unneeded #include <linux/ide.h>'s

2008-08-05 18:17:00 +02:00

math-emu

Stringify support commas

2008-07-20 17:24:38 -07:00

mm

m68k: use generic show_mem()

2008-07-26 12:00:11 -07:00

mvme16x

mvme16x-rtc: BKL pushdown

2008-07-02 15:06:23 -06:00

mvme147

m68k: missing __init

2007-07-20 08:24:49 -07:00

q40

m68k/q40/config.c: make functions static

2008-07-20 17:24:39 -07:00

sun3

m68k/sun3/: possible cleanups

2008-07-20 17:24:39 -07:00

sun3x

m68k: missing __init

2007-07-20 08:24:49 -07:00

tools/amiga

Convert files to UTF-8 and some cleanups

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

Kconfig

Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT

2008-09-06 19:30:22 +01:00

Kconfig.debug

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile

m68k: make multi_defconfig the default defconfig

2008-07-20 17:24:38 -07:00