tree 73e0e1302be5af9a253401bff7bad3ec528ce380
parent a17e18790a8c47113a73139d54a375dc9ccd8f08
parent 15cbf627abcd93c3c668d5a92d58d9fec8f953dd
author Linus Torvalds <torvalds@linux-foundation.org> 1266897073 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266897073 -0800

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"