aboutsummaryrefslogtreecommitdiff
path: root/drivers/kvm/kvm_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-11 11:48:00 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-11 11:48:00 -0800
commit22fb53c943b0ad4f86639bccb7ad8753be8ce435 (patch)
tree6051a0be08c1af5b1047014dbaffdb0fd8e65e8a /drivers/kvm/kvm_main.c
parent8dab63761219d7bc6a7d7d3b5f0fca76af5533a5 (diff)
parente452e94e21e8f4a3c2ff045b301ca21c1f6d03bf (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Replace 40c7869b693b18412491fdcff64682215b739f9e kludge [MIPS] Lasat: Fix built in separate object directory. [MIPS] Malta: Fix software reset on big endian [MIPS] pnx8xxx: move to clocksource [MIPS] Wrong CONFIG option prevents setup of DMA zone.
Diffstat (limited to 'drivers/kvm/kvm_main.c')
0 files changed, 0 insertions, 0 deletions