diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-27 21:52:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-27 21:52:43 -0400 |
| commit | 8536bbaff44addff8d2ac66da1156c95b1e00c4e (patch) | |
| tree | 56b11bc2107e6683b40d9eceb47a3242348ec43e /include/asm-arm/parport.h | |
| parent | 7529963cb9c5db6821f0a00fc8426ebed79fc2e0 (diff) | |
| parent | a6bd8e13034dd7d60b6f14217096efa192d0adc1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: comment documentation update.
lguest: Don't need comment terminator before disk section.
lguest: lguest.txt documentation fix
lguest: Add puppies which where previously missing.
virtio_pci: unregister virtio device at device remove
Diffstat (limited to 'include/asm-arm/parport.h')
0 files changed, 0 insertions, 0 deletions