new file:   drivers/net/dm9000.c
接收u-boot传来的mac地址
	new file:   drivers/i2c/busses/i2c-s3c2410.c
	modified:   .config
Merge branch 'master' into shampoo

Conflicts:
	.config