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)
commitf9342e2c3e81d62e42393c0c1a8179c309ef3a20
tree3611266f5c9c7a10d13ee181f2ec70b938d7109c
parent74faaf96564e6d60fb436e0c1f9e502b778fe9ec
parentbd25fdba45de4371daa7338110731872c08bf7cf
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

* '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
Makefile