diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-13 08:14:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-13 08:14:41 -0700 |
| commit | 411fdc1a711665cb4bd13df2a75213153d463375 (patch) | |
| tree | 3d228fb3563d2270ae2bcf5272298748017b9b9f /net | |
| parent | 7f14daa19ea36b200d237ad3ac5826ae25360461 (diff) | |
| parent | 81c06b10bcd4c7e8c88b4b425c55402b1d65fd0e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6:
[VOYAGER] fix up ptregs removal mess
[VOYAGER] fix up attribute packed specifiers in voyager.h
[VOYAGER] fix genirq mess
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions