From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Mar 2007 20:53:40 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.21-rc6~78
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6faee84b006af55bab9908741dd76916c8450be2;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Trivial fix for hp6xx build.
  sh: Fixup __cmpxchg() compile breakage with gcc4.
  sh: Kill bogus GCC4 symbol exports.
---

6faee84b006af55bab9908741dd76916c8450be2