Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

[platform/kernel/u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7c56594..89e96f5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.a
 *.o
 *~
+*.patch
 
 #
 # Top-level generic files
@@ -37,6 +38,7 @@
 
 # stgit generated dirs
 patches-*
+.stgit-edit.txt
 
 # quilt's files
 patches