]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e252f4d 8449fc3)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2008 23:55:34 +0000 (15:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2008 23:55:34 +0000 (15:55 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: dv1394: fix possible deadlock in multithreaded clients
  ieee1394: raw1394: fix possible deadlock in multithreaded clients
  ieee1394: struct device - replace bus_id with dev_name(), dev_set_name()
  firewire: struct device - replace bus_id with dev_name(), dev_set_name()

1  2 
drivers/ieee1394/dv1394.c patch | diff1 | diff2 | blob | history
drivers/ieee1394/raw1394.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ieee1394/dv1394.c
Simple merge
diff --cc drivers/ieee1394/raw1394.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.