diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 13:23:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 13:23:08 -0400 |
| commit | 70057a5a61a9c703aac0cc51811de8d3384d2889 (patch) | |
| tree | dbc78019d3dab85d43baa11fe661e4a3eaeb61a6 /virt/kvm/ioapic.c | |
| parent | 343d04d44bb069064180f5763a41acaa9245f8e6 (diff) | |
| parent | 8702d33aa6e6d753ef99163afe48aba1323374ef (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: nosy: fix build when CONFIG_FIREWIRE=N
firewire: ohci: activate cycle timer register quirk on Ricoh chips
Diffstat (limited to 'virt/kvm/ioapic.c')
0 files changed, 0 insertions, 0 deletions