Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging
authorWolfgang Denk <wd@denx.de>
Mon, 5 Dec 2011 20:32:42 +0000 (21:32 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 5 Dec 2011 20:32:42 +0000 (21:32 +0100)
commit163b29469d27452a3461e0b5947030a2abfe6169
tree6fac0698730e1d5df87c22ce86c75fa708e736e0
parent6d1d5cf96ef9d7756a741709071c9c23b8490a0c
parent6f26185435fa196ab6ca605575fc880d2d0b3e27
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