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
..
acpi	Merge branch 'ec' into release	2008-11-11 21:17:26 -05:00
asm-arm
asm-frv
asm-generic	Fix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y	2008-11-08 10:02:48 -08:00
asm-h8300
asm-m32r
asm-m68k	proc: move /proc/hardware to m68k-specific code	2008-10-23 14:24:03 +04:00
asm-mn10300
asm-x86	x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps	2008-10-31 10:12:38 +01:00
asm-xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6	2008-10-23 09:16:56 -07:00
crypto
drm	drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA	2008-11-11 18:02:12 +10:00
keys	KEYS: Disperse linux/key_ui.h	2008-11-14 10:39:13 +11:00
linux	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
math-emu
media
mtd
net	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
pcmcia
rdma
rxrpc
scsi	scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map	2008-10-27 19:25:30 +01:00
sound	Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus	2008-11-10 17:58:46 +01:00
trace
video	atmel_lcdfb: change irq_base definition to allow error reporting	2008-11-12 17:17:16 -08:00
xen
Kbuild