summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:53:40 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:53:40 -0700
commit6faee84b006af55bab9908741dd76916c8450be2 (patch)
tree48b9b108625818183f8838ffd8b5b0eb1813f83d /drivers/oprofile
parent2ba302c633754520c990a8c1d161ff304eda6002 (diff)
parentb863f46e6a523276b77dd128ec268f8c509b4554 (diff)
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.
Diffstat (limited to 'drivers/oprofile')
0 files changed, 0 insertions, 0 deletions