Solve the copyright conflicts when merging 'master' into hpc2.
authorroy zang <tie-fei.zang@freescale.com>
Wed, 29 Nov 2006 01:45:03 +0000 (09:45 +0800)
committerZang Tiefei <roy@bus.ap.freescale.net>
Wed, 29 Nov 2006 01:45:03 +0000 (09:45 +0800)
commit6bd87c0aeea441c49d59fd542b84a9be88d08b17
treee450a5f1e69a78a203a1e15167d7fefa43c5ce7e
parent0a8eb59983047ae3bcc0babf3ee4d10d01abe7da
parentd2c83f549378fb3fc34cb3c2e62fd772fbf8b68b
Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2

Conflicts:

drivers/cfi_flash.c
MAKEALL
Makefile
README
drivers/cfi_flash.c