From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 Jan 2011 15:03:13 +0000 (+0100)
Subject: merge mainline into ahci
X-Git-Tag: 2.00~1204^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=092fd3a072a25de242c1a011545683ae9b3358df;p=thirdparty%2Fgrub.git

merge mainline into ahci
---

092fd3a072a25de242c1a011545683ae9b3358df