Stefan Richter e78483c5ae Merge firewire branches to be released post v2.6.35 ... Conflicts: drivers/firewire/core-card.c drivers/firewire/core-cdev.c and forgotten #include <linux/time.h> in drivers/firewire/ohci.c Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>		2010-08-02 10:09:04 +02:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
perf	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-07-23 13:24:02 -07:00
usb	USB: testusb: testusb compatibility with FunctionFS gadget	2010-05-20 13:21:43 -07:00