mpc83xx: Fix the fatal conflict of merge
[platform/kernel/u-boot.git] / cpu / nios /
2007-09-22 Nobuhiro IwamatsuMerge git://www.denx.de/git/u-boot
2007-09-17 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-08-21 Stefan RoeseMerge with /home/stefan/git/u-boot/u-boot-ppc4xx
2007-08-15 Michal SimekMerge git://www.denx.de/git/u-boot into merge
2007-08-15 Stefan RoeseMerge with git://www.denx.de/git/u-boot.git
2007-08-15 Stefan RoeseMerge with git://www.denx.de/git/u-boot.git
2007-08-14 Wolfgang DenkMerge with /home/wd/git/u-boot/work
2007-08-14 Stefan RoeseMerge with git://www.denx.de/git/u-boot.git
2007-08-14 Ben WarrenSync'd u-boot-net with mainline
2007-08-13 Jon LoeligerMerge commit 'remotes/wd/master'
2007-08-13 Haavard SkinnemoenMerge commit 'upstream/master'
2007-08-12 Wolfgang DenkMinor alignment of output, 2nd try.
2007-08-12 Wolfgang DenkMinor alignment of output
2007-08-09 Wolfgang DenkMerge ... /home/wd/git/u-boot/custodian/u-boot-mpc83xx
2007-08-07 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-08-07 Michal SimekMerge git://www.denx.de/git/u-boot
2007-08-07 Wolfgang DenkMerge with /home/tur/git/u-boot#cm5200-si
2007-08-05 Wolfgang DenkMerge ... /home/wd/git/u-boot/custodian/u-boot-testing
2007-08-03 Andy FlemingMerge branch 'testing' into working
2007-07-09 Jon Loeligercpu/[7a-ln-z]*: Remove obsolete references to CONFIG_CO...
2007-07-03 Jon Loeligercpu/ non-mpc*: Augment CONFIG_COMMANDS tests with defin...
2006-11-27 Wolfgang DenkMerge ... /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-18 Wolfgang DenkMerge ... /home/tur/proj/051_uboot_linux_v38b/u-boot
2006-10-11 Wolfgang DenkMerge ... opensource.freescale.com/u-boot-85xx.git...
2006-10-11 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-10-10 Jon LoeligerMerge branch 'master' of www.denx.de/git/u-boot
2006-10-08 Wolfgang DenkMove "ar" flags to config.mk to allow for silent "make -s"
2006-09-29 Jon LoeligerMerge branch 'mpc86xx'
2006-09-19 Jon LoeligerMerge branch 'mpc85xx'
2006-09-19 Jon LoeligerMerge branch 'master' of www.denx.de/git/u-boot
2006-09-18 Stefan RoeseMerge with /home/stefan/git/u-boot/denx
2006-09-03 Wolfgang DenkMerge with /home/m8/git/u-boot
2006-09-01 Marian BalakowiczAdd support for a saving build objects in a separate...
2006-06-30 Marian BalakowiczMerge: Add support for AMCC 440SPe CPU based eval board...
2006-04-27 Marian BalakowiczAdd support for Freescale M5271: Merge with /work/u...
2006-04-20 Kumar GalaMerge branch 'master' of rsync.denx.de/git/u-boot
2006-04-12 Wolfgang DenkMerge with /home/m8/git/u-boot
2006-04-06 Wolfgang DenkFix Lite500B support: Merge with /home/raj/git/u-boot...
2006-04-05 Wolfgang DenkMerge with /home/sr/git/u-boot/cfi-flash
2006-04-05 Wolfgang DenkMerge with /home/sr/git/u-boot/4xx-sdram
2006-04-01 Wolfgang Denk* Add support for ymodem protocol download
2006-03-31 Wolfgang DenkGCC-4.x fixes: clean up global data pointer initializat...
2004-05-19 wdenkPatch by Scott McNutt, 25 Apr 2004:
2004-02-23 wdenk* Patch by Peter Ryser, 20 Feb 2004:
2004-02-23 wdenk* Patches by Reinhard Meyer, 14 Feb 2004:
2004-02-09 wdenkPatches by Stephan Linz, 30 Jan 2004:
2004-01-04 wdenk* Fix problems caused by Robert Schwebel's cramfs patch
2004-01-03 wdenkPatches by Stephan Linz, 11 Dec 2003:
2003-10-15 wdenk* Patches by Xianghua Xiao, 15 Oct 2003:
2003-10-08 wdenk* Patch by Scott McNutt, 04 Oct 2003: