]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
authorWolfgang Denk <wd@denx.de>
Mon, 21 Nov 2011 21:11:05 +0000 (22:11 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 21 Nov 2011 21:11:05 +0000 (22:11 +0100)
* 'sr@denx.de' of git://git.denx.de/u-boot-staging:
  Makefile: Add the missing dependency for spl target
  gpio: Adapt PCA9698 to standard GPIO API

1  2 
Makefile

diff --cc Makefile
Simple merge