From a8196d0b2fb3bf521486d6e5e35a1cfa47cc599d Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Fri, 27 Aug 2010 11:34:46 -0700
Subject: commits that don't need to be ported to mendocino from larkspur to
 exclude file

---
 .merge-branch-exclude | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .merge-branch-exclude

diff --git a/.merge-branch-exclude b/.merge-branch-exclude
new file mode 100644
index 0000000..461c816
--- /dev/null
+++ b/.merge-branch-exclude
@@ -0,0 +1,4 @@
+6521907e2deb6b13a9048334d70657a2c4f12b73
+fdcf5294b4a60c2a1a75e40442cb09b58e470885
+4935b31eb6b6c755f7ce3e0102a60996c1b1d633
+
-- 
cgit v1.2.3