James Morris 2b82892565 Merge branch 'master' into next ... Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>		2008-11-14 11:29:12 +11:00
..
alpha	CRED: Separate task security context from task_struct	2008-11-14 10:39:16 +11:00
arm	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2008-11-13 11:30:25 -08:00
avr32	Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2008-10-23 15:24:10 +02:00
blackfin	container freezer: implement freezer cgroup subsystem	2008-10-20 08:52:34 -07:00
cris	[CRIS] Remove links from CRIS build	2008-10-31 23:37:57 +01:00
frv	container freezer: implement freezer cgroup subsystem	2008-10-20 08:52:34 -07:00
h8300	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	2008-10-23 08:20:34 -07:00
ia64	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile	2008-10-23 10:05:40 -07:00
m68k	proc: move /proc/stram to m68k-specific code	2008-10-23 14:25:35 +04:00
m68knommu	container freezer: implement freezer cgroup subsystem	2008-10-20 08:52:34 -07:00
mips	CRED: Use creds in file structs	2008-11-14 10:39:25 +11:00
mn10300	MN10300: Don't do misalignment handling for userspace	2008-11-12 10:41:18 -08:00
parisc	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
powerpc	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
s390	CRED: Separate task security context from task_struct	2008-11-14 10:39:16 +11:00
sh	sh: fix sh2a cache entry_mask	2008-10-31 16:29:20 +09:00
sparc	Revert "sparc: correct section of current_pc()"	2008-11-10 12:33:30 -08:00
sparc64	sparc64: Update defconfig.	2008-11-10 12:35:29 -08:00
um	CRED: Pass credentials through dentry_open()	2008-11-14 10:39:22 +11:00
x86	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6	2008-10-23 09:16:56 -07:00
.gitignore
Kconfig	Change UTF8 chars in Kconfig help text about Oprofile AMD barcelona	2008-10-27 19:15:39 +01:00