diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 08:44:33 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 08:44:33 -0600 |
| commit | cac1e30af72c4cf289750193426ebd5d2b6bd1d5 (patch) | |
| tree | eb37cda0433cc28f3455bcd2a525707963517dde /hppa-dis.c | |
| parent | 01e7a53aed945adafc3ee54e2159227839daf0b4 (diff) | |
| parent | 07f35073c6d6d1b2f42a6b3671b8af2f271986b9 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hppa-dis.c')
| -rw-r--r-- | hppa-dis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hppa-dis.c b/hppa-dis.c index 435da73553..420a7d22d0 100644 --- a/hppa-dis.c +++ b/hppa-dis.c @@ -564,7 +564,7 @@ If not, see <http://www.gnu.org/licenses/>. */ */ /* There are two kinds of delay slot nullification: normal which is - * controled by the nullification bit, and conditional, which depends + * controlled by the nullification bit, and conditional, which depends * on the direction of the branch and its success or failure. * * NONE is unfortunately #defined in the hiux system include files. |