projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c2dd9a a2a5729)
Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 19:44:03 +0000 (20:44 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 19:44:03 +0000 (20:44 +0100)
* 'master' of git://git.denx.de/u-boot-video:
  api: export LCD device to external apps
  font: split font data from video_font.h
  tools: logo: split bmp arrays from bmp_logo.h
  lcd: add clear and draw bitmap declaration
  VIDEO: mx3fb: GCC4.6 fix build warnings
  Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug

1  2 
Makefile patch | diff1 | diff2 | blob | history
tools/Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc tools/Makefile
Simple merge
Broadcom-s U-Boot