From: Jiri Kosina Date: Wed, 18 May 2011 15:06:31 +0000 (+0200) Subject: Merge branch 'master' into upstream. X-Git-Tag: v3.0-rc1~345^2^3~2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a Merge branch 'master' into upstream. This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree. --- 6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a