From: Wolfgang Denk <wd@denx.de>
Date: Mon, 21 Nov 2011 21:11:05 +0000 (+0100)
Subject: Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~156
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f9342e2c3e81d62e42393c0c1a8179c309ef3a20;p=oweals%2Fu-boot.git

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
---

f9342e2c3e81d62e42393c0c1a8179c309ef3a20