Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
-rw-r--r-- 424 .gitignore
-rw-r--r-- 610647 CHANGELOG
-rw-r--r-- 190034 CHANGELOG-before-U-Boot-1.1.5
-rw-r--r-- 15951 COPYING
-rw-r--r-- 11571 CREDITS
-rw-r--r-- 12171 MAINTAINERS
-rwxr-xr-x 12226 MAKEALL
-rw-r--r-- 87534 Makefile
-rw-r--r-- 127273 README
drwxr-xr-x - api
drwxr-xr-x - api_examples
-rw-r--r-- 908 arm_config.mk
-rw-r--r-- 952 avr32_config.mk
-rw-r--r-- 918 blackfin_config.mk
drwxr-xr-x - board
drwxr-xr-x - common
-rw-r--r-- 6513 config.mk
drwxr-xr-x - cpu
drwxr-xr-x - disk
drwxr-xr-x - doc
drwxr-xr-x - drivers
drwxr-xr-x - examples
drwxr-xr-x - fs
-rw-r--r-- 910 i386_config.mk
drwxr-xr-x - include
drwxr-xr-x - lib_arm
drwxr-xr-x - lib_avr32
drwxr-xr-x - lib_blackfin
drwxr-xr-x - lib_generic
drwxr-xr-x - lib_i386
drwxr-xr-x - lib_m68k
drwxr-xr-x - lib_microblaze
drwxr-xr-x - lib_mips
drwxr-xr-x - lib_nios
drwxr-xr-x - lib_nios2
drwxr-xr-x - lib_ppc
drwxr-xr-x - lib_sh
drwxr-xr-x - libfdt
-rw-r--r-- 934 m68k_config.mk
-rw-r--r-- 1156 microblaze_config.mk
-rw-r--r-- 1791 mips_config.mk
-rwxr-xr-x 1784 mkconfig
drwxr-xr-x - nand_spl
drwxr-xr-x - net
-rw-r--r-- 962 nios2_config.mk
-rw-r--r-- 947 nios_config.mk
drwxr-xr-x - post
-rw-r--r-- 936 ppc_config.mk
-rw-r--r-- 1256 rules.mk
-rw-r--r-- 906 sh_config.mk
drwxr-xr-x - tools