Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...
[firefly-linux-kernel-4.4.55.git] / .gitignore
index 8faa6c02b39ec3896bd4e989c82ce7f6dbdaf04a..48dce78b1338142f3d2e101c12d06fbfa4006e83 100644 (file)
@@ -31,6 +31,7 @@ modules.builtin
 *.lzo
 *.patch
 *.gcno
+Untitled Project.*
 
 #
 # Top-level generic files
@@ -56,6 +57,7 @@ modules.builtin
 include/config
 include/linux/version.h
 include/generated
+include/asm-arm/mach-types.h
 
 # stgit generated dirs
 patches-*