From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Aug 2010 19:21:49 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0~3499
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=502adf5778f4151dcba3f64dd6ed322151f3712c;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'perf-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  watchdog: Don't throttle the watchdog
  tracing: Fix timer tracing
---

502adf5778f4151dcba3f64dd6ed322151f3712c