From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 25 Apr 2011 15:04:27 +0000 (+0200)
Subject: merge mainline into luks
X-Git-Tag: 2.00~1164^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c767fd198ee16156b7f3cd23051023ddb40f8b7;p=thirdparty%2Fgrub.git

merge mainline into luks
---

8c767fd198ee16156b7f3cd23051023ddb40f8b7