From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 18 May 2011 15:06:31 +0000 (+0200)
Subject: Merge branch 'master' into upstream.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a;p=linux.git

Merge branch 'master' into upstream.

This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.
---

6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a