tree 016630974bdcb00fe529b673f96d389e0fd6dc94
parent 40b8606253552109815786e5d4b0de98782d31f5
parent 2e532d68a2b3e2aa6b19731501222069735c741c
author Arjan van de Ven <arjan@linux.intel.com> 1224260426 -0700
committer Arjan van de Ven <arjan@linux.intel.com> 1224260426 -0700

Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c