commit | 8ec0d990abcb0676a9cc0bddc0cb6d41dc54e1bf | [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 | 0687e3081cf620b6a332859ed45f148ee5331b8b [diff] | |
parent | abdb55aaa809075b59653b389d80c4383f2dd2ed [diff] |
Merge branch 'next' of git://git.denx.de/u-boot-avr32 Conflicts: MAINTAINERS