Merge branch 'master' of ssh://rtsrv.cs.unc.edu/home/litmus/rthp

4 files changed, 29 insertions, 1 deletions

diff --git a/litmuslunch.html b/litmuslunch.html
index ac3e1af..7f2f36b 100644
--- a/litmuslunch.html
+++ b/litmuslunch.html
@@ -42,7 +42,15 @@
                 <td>Presenter</td>
                 <td>Topic</td>
             </tr>
-
+            <tr>
+                <td>11/02/2015</td>
+                <td>Namhoon&nbsp;Kim</td>
+                <td><a href="lunch/2015-11-02-Debugging_and_Tracing.pptx">Debugging and Tracing</a></td>
+            </tr>
+            <tr>
+                <td></td><td></td>
+                <td><a href="lunch/2015-11-02-LitmusGFIFOTutorial.docx">G-FIFO Tutorial</a></td>
+            </tr>
             <tr>
                 <td>10/26/2015</td>
                 <td>Namhoon&nbsp;Kim</td>
diff --git a/lunch.html b/lunch.html
index b410427..20e333f 100644
--- a/lunch.html
+++ b/lunch.html
@@ -45,6 +45,26 @@
                 <td>Topic</td>
         </tr>   
         <tr>
+                <td>11/18/2015</td>
+                <td>Zhishan Guo</td>
+                <td>MC-Fluid: simplified and optimally quantified</td>
+    </tr>
+        <tr>
+                <td>11/11/2015</td>
+                <td>Namhoon Kim</td>
+                <td>Attacking the One-Out-Of-m Multicore Problem by Combining Hardware Management with Mixed-Criticality Provisioning</td>
+    </tr>
+        <tr>
+                <td>10/28/2015</td>
+                <td>Micaiah Chisholm</td>
+                <td>Cache Sharing and Isolation Tradeoffs in Multicore Mixed-Criticality Systems</td>
+    </tr>
+        <tr>
+                <td>10/21/2015</td>
+                <td>Bryan Ward</td>
+                <td>Relaxing Resource-Sharing Constraints for Improved Hardware Management and Schedulability</td>
+    </tr>
+        <tr>
                 <td>10/7/2015</td>
                 <td>Catherine Jarrett</td>
                 <td>A Contention-Sensitive Fine-Grained Locking Protocol for Multiprocessor Real-Time Systems</td>
diff --git a/lunch/2015-11-02-Debugging_and_Tracing.pptx b/lunch/2015-11-02-Debugging_and_Tracing.pptx
new file mode 100644
index 0000000..bd075f8
--- /dev/null
+++ b/lunch/2015-11-02-Debugging_and_Tracing.pptx
diff --git a/lunch/2015-11-02-LitmusGFIFOTutorial.docx b/lunch/2015-11-02-LitmusGFIFOTutorial.docx
new file mode 100644
index 0000000..6e4064f
--- /dev/null
+++ b/lunch/2015-11-02-LitmusGFIFOTutorial.docx