[backfire] merge r24238 & r26785

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26786 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/.gitignore b/.gitignore
index e68b0d9..f9458c7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
 /files
 /package/feeds
 /package/openwrt-packages
+*.orig
+*.rej
+*~