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
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
rxrpc
scsi
sound
trace	tracing: Drop cpparg() macro	2010-08-02 01:31:28 +02:00
video
xen
Kbuild