Merge branch 'master' of git://git.denx.de/u-boot-x86
authorWolfgang Denk <wd@denx.de>
Thu, 3 Nov 2011 19:36:04 +0000 (20:36 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 3 Nov 2011 19:36:04 +0000 (20:36 +0100)
commite84fb175f671d2dc9a0b2253ac28b85a2f3620cd
treef4c11f508d0b6e2181595a887ccbb7dc004b976e
parentb2b4449aa7fcbf2b3042cd9100f5857d89480812
parent4c1c355a68d102e900617639d702c35390564355
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