git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11c34c7 3ff6a46)
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)
Conflicts:
include/linux/kvm.h


Trivial merge
Pandora Kernel Repository