Ingo Molnar a3d06cc6aa Merge branch 'linus' into perfcounters/core ...

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-06-17 13:06:17 +02:00

..

acpi

…

asm-generic

Merge branch 'linus' into perfcounters/core

2009-06-17 13:06:17 +02:00

crypto

…

drm

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2009-06-16 21:20:39 -07:00

keys

…

linux

Merge branch 'linus' into perfcounters/core

2009-06-17 13:06:17 +02:00

math-emu

…

media

V4L/DVB (11933): tuner-simple, tveeprom: Add Philips FQ1216LME MK3 analog tuner

2009-06-16 19:07:25 -03:00

mtd

…

net

Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck

2009-06-16 13:09:51 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15 03:02:23 -07:00

sound

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

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

trace

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-06-15 03:02:23 -07:00

video

fbdev: s1d13xxxfb: add accelerated bitblt functions

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

xen

…

Kbuild

…