Fix the confilcts when merging 'master' into hpc2.
[platform/kernel/u-boot.git] / drivers / qe / Makefile
2006-12-01 roy zangFix the confilcts when merging 'master' into hpc2.
2006-11-30 Wolfgang DenkMerge ... opensource.freescale.com/u-boot-83xx.git
2006-11-29 Kim PhillipsMerge http://www.denx.de/git/u-boot
2006-11-04 Dave Liumpc83xx: add QE ethernet support