diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 12:28:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 12:28:41 -0700 |
| commit | 7ff3e52cf2947ebd38c84159af68e5a29d228f6c (patch) | |
| tree | 17f1a54b368554b722c18c28852ded0f90856865 /arch/sparc/kernel/time.c | |
| parent | ff3df54efacff4ecdcab32826e45798453eecf90 (diff) | |
| parent | b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: nodemgr: fix startup of knodemgrd
Diffstat (limited to 'arch/sparc/kernel/time.c')
0 files changed, 0 insertions, 0 deletions