diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 21:28:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 21:28:41 +0200 |
| commit | 7ff3e52cf2947ebd38c84159af68e5a29d228f6c (patch) | |
| tree | 17f1a54b368554b722c18c28852ded0f90856865 /include/asm-m68knommu/socket.h | |
| parent | Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6 (diff) | |
| parent | ieee1394: nodemgr: fix startup of knodemgrd (diff) | |
| download | linux-7ff3e52cf2947ebd38c84159af68e5a29d228f6c.tar.xz linux-7ff3e52cf2947ebd38c84159af68e5a29d228f6c.zip | |
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 'include/asm-m68knommu/socket.h')
0 files changed, 0 insertions, 0 deletions