| commit | e78483c5aeb0d7fbb0e365802145f1045e62957e | [log] [tgz] |
|---|---|---|
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | Mon Aug 02 09:33:25 2010 +0200 |
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | Mon Aug 02 10:09:04 2010 +0200 |
| tree | cc1c4733486f562b26ab812ce38ff8026da70007 | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 [diff] | |
| parent | b20d02e37eeabf34b40c3995c2dbb0af53da3c57 [diff] | |
| parent | 20802224298ce9dfd99a7e26b675fc0c8ae26cac [diff] |
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>