From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Mon, 2 Aug 2010 07:33:25 +0000 (+0200)
Subject: Merge firewire branches to be released post v2.6.35
X-Git-Tag: v2.6.36-rc1~490^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e78483c5aeb0d7fbb0e365802145f1045e62957e;p=pandora-kernel.git

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>
---

e78483c5aeb0d7fbb0e365802145f1045e62957e
Reading git-diff-tree failed