Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / arch / arm / boot / compressed / .gitignore

diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index aefee20cbf987abc7db39f5dc7084b0bed127b47..ab204db594d3fc23cea35384a668d706a18c1a1c 100644 (file)
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -1 +1,3 @@
+font.c
 piggy.gz
+vmlinux.lds