diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 13:36:18 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 13:36:18 +0100 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /arch/alpha/include/asm/termios.h | |
| parent | KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte() (diff) | |
| parent | KVM: do not treat noslot pfn as a error pfn (diff) | |
| download | linux-0588000eac9ba4178cebade437da3b28e8fad48f.tar.xz linux-0588000eac9ba4178cebade437da3b28e8fad48f.zip | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'arch/alpha/include/asm/termios.h')
0 files changed, 0 insertions, 0 deletions