git.librecmc.org Git - oweals/u-boot.git/commit

author	roy zang <tie-fei.zang@freescale.com>
	Wed, 29 Nov 2006 01:45:03 +0000 (09:45 +0800)
committer	Zang Tiefei <roy@bus.ap.freescale.net>
	Wed, 29 Nov 2006 01:45:03 +0000 (09:45 +0800)
commit	6bd87c0aeea441c49d59fd542b84a9be88d08b17
tree	e450a5f1e69a78a203a1e15167d7fefa43c5ce7e	tree \| snapshot
parent	0a8eb59983047ae3bcc0babf3ee4d10d01abe7da	commit \| diff
parent	d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b	commit \| diff

Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2

Conflicts:

drivers/cfi_flash.c

Unnamed repository; edit this file 'description' to name the repository.