Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Feb 2010 03:51:13 +0000 (19:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Feb 2010 03:51:13 +0000 (19:51 -0800)
commit26b0833366c2521b890dfa8cb0e922be7debed37
tree73e0e1302be5af9a253401bff7bad3ec528ce380
parenta17e18790a8c47113a73139d54a375dc9ccd8f08
parent15cbf627abcd93c3c668d5a92d58d9fec8f953dd
Merge branch 'parisc/tracehook' of git://git./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"