From: Wolfgang Denk <wd@denx.de>
Date: Mon, 5 Dec 2011 20:32:42 +0000 (+0100)
Subject: Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~94
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=163b29469d27452a3461e0b5947030a2abfe6169

Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging

* 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging:
  tools/os_support: add OS X Lion support
  board/esd/dasa_sim/flash.c: Fix GCC 4.6 warning
  board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning
---

163b29469d27452a3461e0b5947030a2abfe6169