From: Wolfgang Denk <wd@denx.de>
Date: Mon, 28 Nov 2011 18:57:38 +0000 (+0100)
Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~106^2~37
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68435fa1519cb92493fd59e05bc9dbe7f2205feb;p=u-boot

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  MAKEALL: drop obsolete mx31pdk_nand target
  dataflash: fix parameters order in write_dataflash()
  hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
  davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
  davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
  arm: a320evb: define mach-type in board config file
  OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
  Fix Stelian's email address
---

68435fa1519cb92493fd59e05bc9dbe7f2205feb