From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Dec 2012 00:59:50 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: MMI-PSA29.97-13-9~15489
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8fdd78eeb11aeda018b22424f863344ef83a92d3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

8fdd78eeb11aeda018b22424f863344ef83a92d3