Merge commit 'linus/master' into merge-linus
authorArjan van de Ven <arjan@linux.intel.com>
Fri, 17 Oct 2008 16:20:26 +0000 (09:20 -0700)
committerArjan van de Ven <arjan@linux.intel.com>
Fri, 17 Oct 2008 16:20:26 +0000 (09:20 -0700)
Conflicts:

arch/x86/kvm/i8254.c


Trivial merge