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

..

configs

[PARISC] move defconfig to arch/parisc/configs/

2008-03-15 19:12:08 -07:00

hpux

fix typo in arch/parisc/hpux/fs.c

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

kernel

lib: Correct printk %pF to work on all architectures

2008-09-09 11:51:15 -07:00

lib

Revert "parisc: fix trivial section name warnings"

2008-06-13 10:49:45 -04:00

math-emu

kbuild: fix up CFLAGS usage

2007-10-14 21:49:42 +02:00

mm

mm: drop unneeded pgdat argument from free_area_init_node()

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

oprofile

Combine instrumentation menus in kernel/Kconfig.instrumentation

2007-10-19 11:53:54 -07:00

defpalo.conf

Linux-2.6.12-rc2

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

install.sh

Linux-2.6.12-rc2

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

Kconfig

Remove redundant CONFIG_ARCH_SUPPORTS_AOUT

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

Kconfig.debug

alpha/parisc: remove config variable DEBUG_RWLOCK

2008-02-06 10:41:03 -08:00

Makefile

[PARISC] move defconfig to arch/parisc/configs/

2008-03-15 19:12:08 -07:00

nm

Linux-2.6.12-rc2

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