tree 48b9b108625818183f8838ffd8b5b0eb1813f83d
parent 2ba302c633754520c990a8c1d161ff304eda6002
parent b863f46e6a523276b77dd128ec268f8c509b4554
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175115220 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175115220 -0700

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.