Revert some merge-errors

[linux-2.6-omap-h63xx.git] / arch / arm / boot / .gitignore

diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index bbe9905f3ae79aff1c7d3c2814b351d33fd82537..ce1c5ff746e7d2930fc0ec2005b6e65b35bd9a91 100644 (file)
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -1,5 +1,5 @@
 Image
 zImage
-uImage
 xipImage
 bootpImage
+uImage