From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Dec 2013 23:33:47 +0000 (+0100)
Subject: Merge branch 'master' into phcoder/scratch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cbee7340ce084ff16e801d6e8fcbca80fcd58d4;p=thirdparty%2Fgrub.git

Merge branch 'master' into phcoder/scratch

Conflicts:
	grub-core/kern/arm/cache_armv6.S
	grub-core/kern/uboot/init.c
	include/grub/arm/system.h
---

2cbee7340ce084ff16e801d6e8fcbca80fcd58d4