Merge git://www.denx.de/git/u-boot
authorMichal Simek <monstr@monstr.eu>
Mon, 7 May 2007 22:32:35 +0000 (00:32 +0200)
committerMichal Simek <monstr@monstr.eu>
Mon, 7 May 2007 22:32:35 +0000 (00:32 +0200)
commit3c4bd60de15d79ddfc0cf3170a55847b2025d93f
tree891b84b58f13a5f45536a243585b9d94c253a410
parentfb05f6da35ea1c15c553abe6f23f656bf18dc5db
parentac4cd59d59c9bf3f89cb7a344abf8184d678f562
Merge git://www.denx.de/git/u-boot

Conflicts:

include/asm-microblaze/microblaze_intc.h
include/linux/stat.h
README
common/Makefile
cpu/microblaze/start.S
include/configs/xupv2p.h
include/linux/stat.h