aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2010-08-02 09:33:25 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-08-02 10:09:04 +0200
commite78483c5aeb0d7fbb0e365802145f1045e62957e (patch)
treecc1c4733486f562b26ab812ce38ff8026da70007 /tools
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
parentb20d02e37eeabf34b40c3995c2dbb0af53da3c57 (diff)
parent20802224298ce9dfd99a7e26b675fc0c8ae26cac (diff)
downloadmrst-s0i3-test-e78483c5aeb0d7fbb0e365802145f1045e62957e.tar.gz
mrst-s0i3-test-e78483c5aeb0d7fbb0e365802145f1045e62957e.tar.xz
mrst-s0i3-test-e78483c5aeb0d7fbb0e365802145f1045e62957e.zip
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>