summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-08-05 12:18:06 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-08-05 12:18:06 -0400
commit89a0ca304378ecef50d733058b5f9dbeff2a363b (patch)
tree520d34b0d9ca78d8dfdf6f5e9aff21047426ae06
parent4d6134b2614044f04801bf67a2f9b4702c59bc92 (diff)
downloadlongterm-queue-2.6.34-89a0ca304378ecef50d733058b5f9dbeff2a363b.tar.gz
update chosen parents for leapsecond fix content
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--audit/chosen_parents.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/audit/chosen_parents.txt b/audit/chosen_parents.txt
index 5dbb7d9..d5f0d80 100644
--- a/audit/chosen_parents.txt
+++ b/audit/chosen_parents.txt
@@ -1202,3 +1202,14 @@ e0c87bd95e8dad455c23bc56513af8dcb1737e55
ce7e9065958191e6b7ca49d7ed0e1099c486d198
f197ac13f6eeb351b31250b9ab7d0da17434ea36
4a26620df451ad46151ad21d711ed43e963c004e
+f55a6faa384304c89cfef162768e88374d3312cb
+5baefd6d84163443215f4a99f6a20f054ef11236
+196951e91262fccda81147d2bcf7fdab08668b40
+dd48d708ff3e917f6d6b6c2b696c3f18c019feed
+6b43ae8a619d17c4935c3320d2ef9e92bdeed05d
+cc06268c6a87db156af2daed6e96a936b955cc82
+3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0
+fad0c66c4bb836d57a5f125ecd38bed653ca863a
+4873fa070ae84a4115f0b3c9dfabc224f1bc7c51
+5b9fe759a678e05be4937ddf03d50e950207c1c0
+f6c06abfb3972ad4914cef57d8348fcb2932bc3b