Fix merge problems
[platform/kernel/u-boot.git] / include / configs / mp2usb.h
2008-08-06 Stefan RoeseFix merge problems
2008-04-25 Wolfgang DenkMerge branch 'master' of /home/wd/git/u-boot/lwmon5
2008-04-07 Wolfgang DenkMerge branch 'master' of git://denx.de/git/u-boot-fdt
2008-04-07 Wolfgang DenkMerge branch 'master' of git://denx.de/git/u-boot-at91
2008-03-30 David Brownelluse correct at91rm9200 register name
2008-02-13 Jon LoeligerMerge commit 'wd/master'
2008-02-11 Wolfgang DenkMerge branch 'master' of /home/wd/git/u-boot/custodians
2008-02-11 Wolfgang DenkMerge branch 'master' of /home/wd/git/u-boot/custodians
2008-02-03 Ladislav MichlARM: AT91RM9200 based boards config cleanup
2007-09-22 Nobuhiro IwamatsuMerge git://www.denx.de/git/u-boot
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 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 Haavard SkinnemoenMerge commit 'upstream/master'
2007-08-10 Gerald Van BarenMerge git://www.denx.de/git/u-boot
2007-08-10 Wolfgang DenkMerge ... git+ssh://atlas/home/wd/git/u-boot/master
2007-08-09 Wolfgang DenkMerge ... git+ssh://atlas/home/wd/git/u-boot/master
2007-08-09 Wolfgang DenkMerge ... /home/wd/git/u-boot/custodian/u-boot-usb
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-10 Jon Loeligerinclude/configs/[g-o]*: Cleanup BOOTP and lingering...
2007-07-05 Jon Loeligerinclude/configs: Use new CONFIG_CMD_* in various m...
2007-06-06 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-05-29 Markus KlotzbuecherMerge git://denx.de/git/u-boot into 2007_05_15-testing
2007-05-07 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-04-23 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-04-03 Markus KlotzbuecherMerge with git://www.denx.de/git/u-boot.git
2007-03-23 Markus KlotzbuecherMerge ... git://denx.de/git/u-boot.git#testing-USB
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-27 Markus KlotzbuecherIntroduced the configuration option CONFIG_USB_OHCI_NEW...
2006-11-27 Markus KlotzbuecherModified the mpc5xxx and the ppc4xx cpu to use the...
2006-08-07 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-06-26 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-06-26 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-06-14 Wolfgang DenkMerge with /home/wd/git/u-boot/master
2006-05-31 Wolfgang DenkMerge with /home/mk/git/u-boot#generic_ohci
2006-05-23 Markus KlotzbuecherChanged the mp2usb (at91rm9200) board to use the generi...
2006-02-24 Bartlomiej SiekaMerge ... /home/wd/git/u-boot/testing-NAND/ to add...
2005-09-25 Wolfgang DenkAdd support for AT91RM9200 OHCI Controller.
2005-09-25 Wolfgang DenkAdd support for MP2USB board.