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

Conflicts:
	security/Kconfig

Manual fix.

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

2009-08-20 09:18:42 +10:00

..

acpi

Revert "ACPICA: Remove obsolete acpi_os_validate_address interface"

2009-07-27 18:42:38 -04:00

asm-generic

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

crypto

crypto: zlib - New zlib crypto module, using pcomp

2009-03-04 15:16:19 +08:00

drm

drm/radeon/kms: implement bo busy check + current domain

2009-08-17 12:28:56 +10:00

keys

KEYS: Disperse linux/key_ui.h

2008-11-14 10:39:13 +11:00

linux

Merge branch 'master' into next

2009-08-20 09:18:42 +10:00

math-emu

math-emu: Fix thinko in _FP_DIV

2008-10-22 22:09:59 -07:00

media

V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.

2009-07-24 14:03:30 -03:00

mtd

Kill jffs2-user.h

2009-06-05 17:31:38 +01:00

net

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

pcmcia

…

rdma

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2009-03-26 15:54:36 -07:00

rxrpc

…

scsi

sd, sr: fix Driver 'sd' needs updating message

2009-06-21 12:01:27 -05:00

sound

Merge branch 'topic/pcm-jiffies-check' into for-linus

2009-06-10 07:26:41 +02:00

trace

perf_counter: Zero dead bytes from ftrace raw samples size alignment

2009-08-10 16:51:19 +02:00

video

fbdev: s1d13xxxfb: add accelerated bitblt functions

2009-06-16 19:48:00 -07:00

xen

Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen/xenfs' and 'for-linus/xen/sys-hypervisor' into for-linus/xen/master

2009-03-30 10:00:45 -07:00

Kbuild

[SCSI] FC Pass Thru support

2009-06-12 14:20:05 -05:00