]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c406d96 59aa21b 444bf6d)
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)
commit015f73690f9828f6649e45a569640454f1d0ca10
treecc1c4733486f562b26ab812ce38ff8026da70007tree | snapshot
parentc406d9686ef1d925c0eeb81c25acf2225c05c139commit | diff
parent59aa21bdd7ff218141cb2fdc5dfbbf6cccf9d956commit | diff
parent444bf6d2cb3a188c97f5fd0060d9039fd9251883commit | 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 Kernel Source Tree.