diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
| commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
| tree | e48942a05882da47544e179c6a0c920e00137a6a /arch/metag/tbx/tbidefr.S | |
| parent | 8ed814602876bec9bad2649ca17f34b499357a1c (diff) | |
| parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) | |
| download | linux-stable-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.gz linux-stable-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.bz2 linux-stable-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip | |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'arch/metag/tbx/tbidefr.S')
| -rw-r--r-- | arch/metag/tbx/tbidefr.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/metag/tbx/tbidefr.S b/arch/metag/tbx/tbidefr.S index 3eb165ebf540..8f0902b22f70 100644 --- a/arch/metag/tbx/tbidefr.S +++ b/arch/metag/tbx/tbidefr.S @@ -20,7 +20,7 @@ /* D1Ar1:D0Ar2 -- State * D0Ar3 -- SigNum * D0Ar4 -- Triggers - * D1Ar5 -- InstOrSWSId + * D1Ar5 -- Inst * D0Ar6 -- pTBI (volatile) */ ___TBIHandleDFR: |