Ingo Molnar 61be7fdec2 Merge branch 'perf/nmi' into perf/core ... Conflicts: kernel/Makefile Merge reason: Add the now complete topic, fix the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-05 08:45:05 +02:00
..
acpi	ACPI: skip checking BM_STS if the BIOS doesn't ask for it	2010-07-22 16:54:27 -04:00
asm-generic	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
crypto	crypto: skcipher - Add ablkcipher_walk interfaces	2010-05-19 14:13:07 +10:00
drm	drm/ttm: Allocate the page pool manager in the heap.	2010-07-07 12:14:11 +10:00
keys
linux	Merge branch 'perf/nmi' into perf/core	2010-08-05 08:45:05 +02:00
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-07-20 18:45:14 -07:00
media	V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner	2010-07-08 16:49:53 -03:00
mtd
net	net sched: fix race in mirred device removal	2010-07-24 21:04:20 -07:00
pcmcia
rdma	IB/core: Allow device-specific per-port sysfs files	2010-05-21 10:34:44 -07:00
rxrpc
scsi	SCSI: implement sd_unlock_native_capacity()	2010-06-02 13:50:04 -04:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
trace	tracing: Drop cpparg() macro	2010-08-02 01:31:28 +02:00
video	fbdev: move FBIO_WAITFORVSYNC to linux/fb.h	2010-05-25 08:07:09 -07:00
xen
Kbuild