commit | 6e2fbdea1b26d75314d87c380a36b0015bf824cf | [log] [tgz] |
---|---|---|
author | Wolfgang Denk <wd@denx.de> | Sun Sep 02 00:44:09 2012 +0200 |
committer | Wolfgang Denk <wd@denx.de> | Sun Sep 02 00:44:09 2012 +0200 |
tree | 921a60d936848d731eb7b6875788bac2ad98009c | |
parent | df95321ca1b06a6271c3959b371848c10019e165 [diff] | |
parent | 72739219a12bf02820d29a89cb2b7fdc4d0e840f [diff] |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging * 'agust@denx.de' of git://git.denx.de/u-boot-staging: tx25: Use generic gpio_* calls config: Always use GNU ld tools: add kwboot binary to .gitignore file fdt: Include arch specific gpio.h instead of asm-generic/gpio.h serial: CONSOLE macro is not used Conflicts: board/karo/tx25/tx25.c Signed-off-by: Wolfgang Denk <wd@denx.de>