James Morris ec98ce480a Merge branch 'master' into next ...

Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>

2008-12-04 17:16:36 +11:00

..

configs

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

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

hpux

[PATCH] prepare vfs_readdir() callers to returning filldir result

2008-10-23 05:13:10 -04:00

include/asm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2008-11-30 14:04:31 -08:00

kernel

Merge branch 'master' into next

2008-12-04 17:16:36 +11: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

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2008-10-20 14:40:31 -07: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