Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into tmp-rebuil...
authorTony Lindgren <tony@atomide.com>
Tue, 3 May 2011 11:44:58 +0000 (04:44 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 May 2011 11:44:58 +0000 (04:44 -0700)

Trivial merge