diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:07:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:07:19 -0800 |
| commit | 920841d8d1d61bc12b43f95a579a5374f6d98f81 (patch) | |
| tree | 413be4ee2a75bb523d6e829ef0e52057f408222e /arch/arm/kernel/setup.c | |
| parent | 5c56f466835d20fc4f7119063a8c029f7170a317 (diff) | |
| parent | a65421ea3f8a0e78b4e3b858bdc5ada5ad653807 (diff) | |
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: fix another deadlock in nodemgr
ieee1394: cycle timer read extension for raw1394
Diffstat (limited to 'arch/arm/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions