git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

author	Wolfgang Denk <wd@denx.de>
	Sat, 1 Sep 2012 22:44:09 +0000 (00:44 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 1 Sep 2012 22:44:09 +0000 (00:44 +0200)
commit	6e2fbdea1b26d75314d87c380a36b0015bf824cf
tree	921a60d936848d731eb7b6875788bac2ad98009c	tree \| snapshot
parent	df95321ca1b06a6271c3959b371848c10019e165	commit \| diff
parent	72739219a12bf02820d29a89cb2b7fdc4d0e840f	commit \| 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

Cloned from git://git.denx.de/u-boot.git

RSS Atom