| commit | 26b0833366c2521b890dfa8cb0e922be7debed37 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 22 19:51:13 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 22 19:51:13 2010 -0800 |
| tree | 73e0e1302be5af9a253401bff7bad3ec528ce380 | |
| parent | a17e18790a8c47113a73139d54a375dc9ccd8f08 [diff] | |
| parent | 15cbf627abcd93c3c668d5a92d58d9fec8f953dd [diff] |
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"