From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Mar 2012 15:27:38 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: v3.3-rc7~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0ab5d757db3beb865f52cb59fe4240c4fdc2da55;p=linux-block.git

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull C6X fix from Mark Salter:
 "Fix for C6X KSTK_EIP and KSTK_ESP macros."

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  C6X: fix KSTK_EIP and KSTK_ESP macros
---

0ab5d757db3beb865f52cb59fe4240c4fdc2da55