Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Mar 2012 00:03:15 +0000 (17:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Mar 2012 00:03:15 +0000 (17:03 -0700)
commit9fc005c017101c498f336329c6bdf510bce8ef6e
tree31ccea9241be8238096964a2bc6e2f3bb6c10628
parentc0173863528a8c9212c53e080d63a1aaae5ef4f4
parent6e780cf5c07ab85b9b1825ddd586a53ead10b579
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull c6x bugfix from Mark Salter:
 "Remove dead code from entry.S which causes a build failure when using
  a newer assembler (v2.22 complains about it, v2.20 ignores it)."

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  C6X: remove dead code from entry.S