]> git.kernelconcepts.de Git - karo-tx-uboot.git/history - board/atmel/atstk1000/flash.c
Fix merge problems
[karo-tx-uboot.git] / board / atmel / atstk1000 / flash.c
2008-08-06 Stefan RoeseFix merge problems
2008-06-11 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot...
2008-06-11 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot...
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: Get rid of the .flashprog section
2008-02-21 Marian BalakowiczMerge branch 'master' of /home/git/u-boot
2008-02-15 Peter PearseMerge branch '080208_dupint' of git://linux-arm.org...
2008-02-15 Peter PearseMerge branch '080202_at91rm9200dk' of git://linux-arm...
2008-02-15 Peter PearseMerge branch '080131_artila' of git://linux-arm.org...
2008-02-15 Peter PearseMerge branch '080116_at91cap9' of git://linux-arm.org...
2008-02-15 Peter PearseMerge branch '070524_netstar' of git://linux-arm.org...
2008-02-14 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot-arm
2008-02-14 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot...
2008-02-14 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot...
2008-02-14 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot-sh
2008-02-14 Wolfgang DenkMerge ../custodians
2008-02-14 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot...
2008-02-05 Haavard SkinnemoenATSTK1000: Fix potential flash programming bug
2007-11-28 Nobuhiro IwamatsuMerge git://www.denx.de/git/u-boot
2007-10-19 Andy FlemingMerge branch 'denx'
2007-10-18 Kim PhillipsMerge git://www.denx.de/git/u-boot
2007-10-15 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot-usb
2007-10-14 Michal SimekMerge git://www.denx.de/git/u-boot
2007-10-13 Wolfgang DenkMerge branch 'master' of git://www.denx.de/git/u-boot...
2007-10-06 Haavard SkinnemoenAVR32: Initialize bi_flash* in board_init_r
2007-06-01 Stefan RoeseMerge with /home/stefan/git/u-boot/bamboo-nand
2007-05-27 Wolfgang DenkMerge with /home/tur/git/u-boot#motionpro
2007-05-14 Wolfgang DenkMerge with /home/tur/git/u-boot#motionpro
2007-05-07 Michal SimekMerge git://www.denx.de/git/u-boot
2007-04-29 Stefan RoeseMerge with git://www.denx.de/git/u-boot.git
2007-04-23 Kim PhillipsMerge git://www.denx.de/git/u-boot
2007-04-23 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-04-19 Peter PearseMerge with git://www.denx.de/git/u-boot.git
2007-04-18 Wolfgang DenkMerge with /home/wd/git/u-boot/custodian/u-boot-fdt
2007-04-18 Wolfgang DenkMerge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx
2007-04-18 Wolfgang DenkMerge with /home/wd/git/u-boot/custodian/u-boot-net
2007-04-18 Wolfgang DenkMerge with /home/wd/git/u-boot/custodian/u-boot-74xx-7xx
2007-04-18 Wolfgang DenkMerge with /home/wd/git/u-boot/custodian/u-boot-avr32...
2007-04-14 Haavard SkinnemoenAVR32: Relocate u-boot to SDRAM
2006-11-27 Wolfgang DenkMerge with /home/mk/git/u-boot-generic_ohci#generic_ohci
2006-11-27 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-11-10 Stefan RoeseMerge with /home/stefan/git/u-boot/denx
2006-10-24 Wolfgang DenkFix Makefile for "CHANGELOG" target
2006-10-24 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-10-24 Wolfgang DenkMerge with http://www.jdl.com/software/u-boot-86xx.git
2006-10-24 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-10-24 Wolfgang DenkMerge with /home/wd/git/u-boot/mailing-list/Haavard_Ski...
2006-10-24 Wolfgang DenkMove atstk1000 files into vendor specific directory.