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)
As pointed out by Russell King.

Signed-off-by: Tony Lindgren <tony@atomide.com>

No differences found