Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Mar 2012 15:27:38 +0000 (07:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Mar 2012 15:27:38 +0000 (07:27 -0800)
commit0ab5d757db3beb865f52cb59fe4240c4fdc2da55
treedae37469dcfd4ff9055c326aa1f6a163f0e0a4e9
parent0cacaf51a0b3092fc84e5c8d483721baee67b60f
parent4cd7c0a03ea44ef88fa0d3901d671798d23cbc35
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