From 9e5f827181edcde64dd1baa0f82e1cb4a4adf815 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Sun, 26 May 2013 18:09:38 +0000
Subject: [PATCH] --- yaml --- r: 376521 b: refs/heads/master c:
 24b92375dc4ec8a15262e8aaaab60b7404d4b1e7 h: refs/heads/master i:   376519:
 f148bccaf68a81d2ac040f82472f2345809edd99 v: v3

---
 [refs]                                               | 2 +-
 trunk/Documentation/powerpc/transactional_memory.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1e31372bd12b..09f43dfabea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f7097fcedec63fcba1852dbee96f74a2d90878
+refs/heads/master: 24b92375dc4ec8a15262e8aaaab60b7404d4b1e7
diff --git a/trunk/Documentation/powerpc/transactional_memory.txt b/trunk/Documentation/powerpc/transactional_memory.txt
index c907be41d60f..84e04a0db0f8 100644
--- a/trunk/Documentation/powerpc/transactional_memory.txt
+++ b/trunk/Documentation/powerpc/transactional_memory.txt
@@ -155,6 +155,7 @@ These are defined in <asm/reg.h>, and distinguish different reasons why the
 kernel aborted a transaction:
 
  TM_CAUSE_RESCHED       Thread was rescheduled.
+ TM_CAUSE_TLBI          Software TLB invalide.
  TM_CAUSE_FAC_UNAV      FP/VEC/VSX unavailable trap.
  TM_CAUSE_SYSCALL       Currently unused; future syscalls that must abort
                         transactions for consistency will use this.