]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
projects / karo-tx-uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df95321 7273921)
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorWolfgang Denk <wd@denx.de>
Sat, 1 Sep 2012 22:44:09 +0000 (00:44 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 1 Sep 2012 22:44:09 +0000 (00:44 +0200)
commit6e2fbdea1b26d75314d87c380a36b0015bf824cf
tree921a60d936848d731eb7b6875788bac2ad98009ctree | snapshot
parentdf95321ca1b06a6271c3959b371848c10019e165commit | diff
parent72739219a12bf02820d29a89cb2b7fdc4d0e840fcommit | 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>
board/karo/tx25/tx25.c diff1 | diff2 | blob | history
UBoot for KaRo TX COM modules