]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/w1/slaves/w1_ds2431.c
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9fe6206 b20d02e 2080222)
Merge firewire branches to be released post v2.6.35
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 2 Aug 2010 07:33:25 +0000 (09:33 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 2 Aug 2010 08:09:04 +0000 (10:09 +0200)
commite78483c5aeb0d7fbb0e365802145f1045e62957e
treecc1c4733486f562b26ab812ce38ff8026da70007tree | snapshot
parent9fe6206f400646a2322096b56c59891d530e8d51commit | diff
parentb20d02e37eeabf34b40c3995c2dbb0af53da3c57commit | diff
parent20802224298ce9dfd99a7e26b675fc0c8ae26caccommit | 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>
MAINTAINERS diff1 | diff2 | diff3 | blob | history
drivers/firewire/core-card.c diff1 | diff2 | diff3 | blob | history
drivers/firewire/core-cdev.c diff1 | diff2 | diff3 | blob | history
drivers/firewire/core-device.c diff1 | diff2 | diff3 | blob | history
drivers/firewire/core-iso.c diff1 | diff2 | diff3 | blob | history
drivers/firewire/net.c diff1 | diff2 | diff3 | blob | history
drivers/firewire/ohci.c diff1 | diff2 | diff3 | blob | history
drivers/firewire/sbp2.c diff1 | diff2 | diff3 | blob | history
drivers/ieee1394/sbp2.c diff1 | diff2 | diff3 | blob | history
drivers/media/dvb/firewire/firedtv-fw.c diff1 | diff2 | diff3 | blob | history
include/linux/firewire-cdev.h diff1 | diff2 | diff3 | blob | history
Linux for Marvell Sheeva based platforms