]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d1d5cf 6f26185)
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)
* '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


Trivial merge
My U-Boot fork