| commit | 72d6685e4d5dc2da640567586b593d7be74682ac | [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 | dd359a1d708bb48e4c6f272dc368c5c2a559e6dc [diff] | |
| parent | ddbbdf23848e7fe9c01b4f103bf65e0613c3fbb9 [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>