| commit | 95f328d3ad1a8e4e3175a18546fb35c495e31130 | [log] [tgz] |
|---|---|---|
| author | Gleb Natapov <gleb@redhat.com> | Mon Nov 04 10:20:57 2013 +0200 |
| committer | Gleb Natapov <gleb@redhat.com> | Mon Nov 04 10:20:57 2013 +0200 |
| tree | 2f6496ef8354e9a0a315f23faef744f93fee8265 | |
| parent | daf727225b8abfdfe424716abac3d15a3ac5626a [diff] | |
| parent | a78b55d1c0218b6d91d504941d20e36435c276f5 [diff] |
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue Conflicts: arch/powerpc/include/asm/processor.h