From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Mar 2012 00:03:15 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9fc005c017101c498f336329c6bdf510bce8ef6e;p=openwrt%2Fstaging%2Fblogic.git

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

9fc005c017101c498f336329c6bdf510bce8ef6e