From 6e172ee269b8ce09dfa5a7d442cdefb7c565d755 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 29 Apr 2011 15:15:36 +0000
Subject: [PATCH] [backfire] merge r24238 & r26785

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26786 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index e68b0d9f0..f9458c71f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
 /files
 /package/feeds
 /package/openwrt-packages
+*.orig
+*.rej
+*~