Fix merge problems
[platform/kernel/u-boot.git] / include / configs / atstk1006.h
2008-08-06 Stefan RoeseFix merge problems
2008-07-10 Jon LoeligerMerge commit 'wd/master'
2008-07-10 Stefan RoeseMerge branch 'master' of /home/stefan/git/u-boot/u...
2008-07-09 Wolfgang DenkMerge branch 'master' of git://denx.de/git/u-boot-nand...
2008-07-09 Haavard Skinnemoenavr32: Use CONFIG_ATMEL_MCI to select the atmel_mci...
2008-06-11 Wolfgang DenkMerge branch 'master' of git://denx.de/git/u-boot-cfi...
2008-06-11 Wolfgang DenkMerge branch 'master' of git://denx.de/git/u-boot-ppc4xx
2008-06-09 Ben WarrenMerge branch 'master' of git://git.denx.de/u-boot
2008-06-06 Jon LoeligerMerge commit 'wd/master'
2008-06-04 Wolfgang DenkMerge branch 'master' of ssh://mercury/home/wd/git...
2008-06-02 Wolfgang DenkMerge remote branch 'u-boot-at91/for-1.3.4'
2008-06-02 Wolfgang DenkMerge remote branch 'u-boot-avr32/master'
2008-05-27 Haavard Skinnemoenavr32: Rework SDRAM initialization code
2008-05-27 Haavard Skinnemoenavr32: Add support for the ATSTK1006 board