| commit | 0555d7df2c329cba890667739c8178c9eb54ab46 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Mon Dec 05 21:32:42 2011 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Mon Dec 05 21:32:42 2011 +0100 |
| tree | 6fac0698730e1d5df87c22ce86c75fa708e736e0 | |
| parent | 45befad7c581a101ae4ab14a5355e610aeb0be8f [diff] | |
| parent | 687ed6422b2e92e00239753d83f41d4e69e5a57a [diff] |
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