git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fe6206
b20d02e
2080222
)
Merge firewire branches to be released post v2.6.35
author
Stefan Richter
<stefanr@s5r6.in-berlin.de>
Mon, 2 Aug 2010 07:33:25 +0000
(09:33 +0200)
committer
Stefan Richter
<stefanr@s5r6.in-berlin.de>
Mon, 2 Aug 2010 08:09:04 +0000
(10:09 +0200)
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>
Trivial merge