Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into tmp-rebuil...
authorTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:35 +0000 (10:49 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:35 +0000 (10:49 -0700)

Trivial merge