Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Mar 2007 20:53:40 +0000 (13:53 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Mar 2007 20:53:40 +0000 (13:53 -0700)
commit6faee84b006af55bab9908741dd76916c8450be2
tree48b9b108625818183f8838ffd8b5b0eb1813f83d
parent2ba302c633754520c990a8c1d161ff304eda6002
parentb863f46e6a523276b77dd128ec268f8c509b4554
Merge /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.