Markus Klotzbuecher 50bd0057ba Merge git://git.denx.de/u-boot into x1
Conflicts:

	drivers/usb/usb_ohci.c
2008-10-21 09:18:01 +02:00
..
2008-10-18 21:54:03 +02:00
2008-10-18 21:54:03 +02:00
2004-10-09 22:21:29 +00:00
2008-05-21 00:14:08 +02:00
2008-10-18 21:54:03 +02:00