Frederic Weisbecker 98ee74a75c Merge branch 'perf/urgent' into perf/core ...

Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes

2010-08-27 02:30:07 +02: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-08-27 02:30:07 +02:00

usb

USB: testusb: testusb compatibility with FunctionFS gadget

2010-05-20 13:21:43 -07:00