diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 16:59:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 16:59:50 -0800 |
| commit | 8fdd78eeb11aeda018b22424f863344ef83a92d3 (patch) | |
| tree | 5228aaa0a77d12018c3ee236750df3909767c741 /arch/c6x/include/uapi/asm/kvm_para.h | |
| parent | 31e06a42a34395111842707a85774151245447b7 (diff) | |
| parent | 93bbd0c087eb299e0fe11c59d340932180c082b5 (diff) | |
| download | linux-8fdd78eeb11aeda018b22424f863344ef83a92d3.tar.bz2 | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull C6X fixes from Mark Salter.
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
c6x: use generic kvm_para.h
c6x: remove internal kernel symbols from exported setup.h
c6x: fix misleading comment
c6x: run do_notify_resume with interrupts enabled
Diffstat (limited to 'arch/c6x/include/uapi/asm/kvm_para.h')
| -rw-r--r-- | arch/c6x/include/uapi/asm/kvm_para.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/c6x/include/uapi/asm/kvm_para.h b/arch/c6x/include/uapi/asm/kvm_para.h deleted file mode 100644 index 14fab8f0b957..000000000000 --- a/arch/c6x/include/uapi/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/kvm_para.h> |