From: Wolfgang Denk <wd@denx.de>
Date: Thu, 3 Nov 2011 19:36:04 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-x86
X-Git-Tag: v2011.12-rc1~334
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e84fb175f671d2dc9a0b2253ac28b85a2f3620cd;p=u-boot

Merge branch 'master' of git://git.denx.de/u-boot-x86

* 'master' of git://git.denx.de/u-boot-x86:
  x86: Fix a compiler warning in arch/x86/lib/realmode.c
  x86: Remove the prototype for the unused function board_init
  x86: Rename include/asm/ic to include/asm/arch-sc520
  x86: turn off cache: set control register properly
---

e84fb175f671d2dc9a0b2253ac28b85a2f3620cd