From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Feb 2010 03:51:13 +0000 (-0800)
Subject: Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.33~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=26b0833366c2521b890dfa8cb0e922be7debed37;p=~shefty%2Frdma-dev.git

Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  Revert "parisc: HAVE_ARCH_TRACEHOOK"
---

26b0833366c2521b890dfa8cb0e922be7debed37