| commit | 91703107707b3bde24186e31bfe9eb6736c220db | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Mon Nov 04 09:28:08 2013 -0500 |
| committer | Tom Rini <trini@ti.com> | Mon Nov 04 09:28:08 2013 -0500 |
| tree | 590563a50a027ad53867b2144e763de02427db59 | |
| parent | 3a8e53e6e808db9531f89999b94253af5aa850e9 [diff] | |
| parent | 18b03b5510e0c28711ca3485bfab3f4d978ecd17 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin Easy to resolve conflict on the GPIO change. Conflicts: arch/blackfin/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>