Merge commit 'origin/master' into next

Browse Source

Conflicts:
	include/linux/kvm.h

...

This commit is contained in:

Benjamin Herrenschmidt

2009-12-09 17:14:38 +11:00

parent 11c34c7dea 3ff6a468b4

commit bcd6acd51f

3651 changed files with 249180 additions and 115589 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

961

virt/kvm/kvm_main.c

File diff suppressed because it is too large Load Diff