Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into tmp-rebuil...
authorTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:16:20 +0000 (08:16 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:16:20 +0000 (08:16 -0700)

Trivial merge