commit | d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96 | [log] [tgz] |
---|---|---|
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Wed Aug 20 09:37:09 2008 +0200 |
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Wed Aug 20 09:37:09 2008 +0200 |
tree | 605af42f8834ea0b793e7febe4aba5d899e5f160 | |
parent | fcd69a1a57fb2af4d26201422095a4be9f36963e [diff] | |
parent | 33eac2b3d946fc998a09245dfe54d017079b9056 [diff] |
Merge branch 'next' of git://git.denx.de/u-boot-avr32 Conflicts: MAINTAINERS