diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-11 22:40:57 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-11 22:40:57 -0700 |
commit | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (patch) | |
tree | 5075be2aea3514a9270c0ec48fbc728d8f91f257 /arch/x86/kvm/emulate.c | |
parent | 7ad8f8f1c5a3a92a303fcf90cb2b15205c0a7635 (diff) | |
parent | cab463a2959f4c738fcb26bb69ea7e7ae5755272 (diff) |
Merge branch 'ks8695/timer' into next/cleanup
* ks8695/timer:
watchdog: ks8695: sink registers into driver
Diffstat (limited to 'arch/x86/kvm/emulate.c')
0 files changed, 0 insertions, 0 deletions