tree f4c11f508d0b6e2181595a887ccbb7dc004b976e
parent d7e7aaa2a941fc583c4dbf459864cfd6f1220536
parent 46207f460633cc2ddb23771779b64885a4149dca
author Wolfgang Denk <wd@denx.de> 1320348964 +0100
committer Wolfgang Denk <wd@denx.de> 1320348964 +0100

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