Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / include / asm-arm / .gitignore

diff --git a/include/asm-arm/.gitignore b/include/asm-arm/.gitignore
index e02c15d..e1bf470 100644 (file)
--- a/include/asm-arm/.gitignore
+++ b/include/asm-arm/.gitignore
@@ -1,2 +1,3 @@
 arch
+asm-offsets.h
 mach-types.h