diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 15:55:34 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 15:55:34 -0800 |
commit | 6572a281cfd805dd54718597d6c33261b5be052b (patch) | |
tree | 9e61bf01db351d4371e2daf12fcf50213281572d /arch/arm/include/asm/memory.h | |
parent | e252f4db187ef02d06c8551069d944d327b8bb9a (diff) | |
parent | 8449fc3ae58bf8ee5acbd2280754cde67b5db128 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* '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()
Diffstat (limited to 'arch/arm/include/asm/memory.h')
0 files changed, 0 insertions, 0 deletions