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

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

author	Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
	Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
committer	Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
	Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
commit	d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96
tree	605af42f8834ea0b793e7febe4aba5d899e5f160	tree \| snapshot
parent	fcd69a1a57fb2af4d26201422095a4be9f36963e	commit \| diff
parent	33eac2b3d946fc998a09245dfe54d017079b9056	commit \| diff

Merge branch 'next' of git://git.denx.de/u-boot-avr32

Conflicts:

MAINTAINERS

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