diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-11-04 12:20:57 +0400 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-11-04 12:20:57 +0400 |
| commit | 95f328d3ad1a8e4e3175a18546fb35c495e31130 (patch) | |
| tree | 2f6496ef8354e9a0a315f23faef744f93fee8265 /arch/powerpc/boot/of.c | |
| parent | daf727225b8abfdfe424716abac3d15a3ac5626a (diff) | |
| parent | a78b55d1c0218b6d91d504941d20e36435c276f5 (diff) | |
| download | linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.tar.xz | |
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
Conflicts:
arch/powerpc/include/asm/processor.h
Diffstat (limited to 'arch/powerpc/boot/of.c')
0 files changed, 0 insertions, 0 deletions