Commit Graph

3 Commits

Author SHA1 Message Date
Kyle McMartin
72b3729657 Revert "Merge branch 'kernel-git' strategy 'theirs'"
This reverts commit a3f45c4a9c, reversing
changes made to ee99a68c51.
2010-12-09 13:46:11 -05:00
Kyle McMartin
1aea2328b4 Cherry-pick utrace-ptrace fixes from mayoung. Thanks! 2010-11-08 10:38:33 -05:00
Kyle McMartin
07d3322312 use roland's auto-updated patches for utrace/tracehook 2010-09-01 11:44:15 -04:00