Ingo Molnar 6c869e772c Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/apic/hw_nmi.c Merge reason: Resolve conflict, queue up dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-11-26 15:07:02 +01:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
perf	Merge branch 'perf/urgent' into perf/core	2010-11-26 15:07:02 +01:00
usb	USB: testusb: testusb compatibility with FunctionFS gadget	2010-05-20 13:21:43 -07:00