]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Revert some merge-errors
authorTony Lindgren <tony@atomide.com>
Tue, 9 Sep 2008 15:24:26 +0000 (08:24 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Sep 2008 15:24:26 +0000 (08:24 -0700)
commitc1e65dbd68c5d91bca29d057501ba1aeb83fd954
tree66b4195f1dda576216bdbc3800f024ca114d59b1
parent1a13a473443294b7cdc350ac2e55447c5d534f93
Revert some merge-errors

As pointed out by Russell King.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/.gitignore
arch/arm/boot/compressed/head.S