roy zang 6bd87c0aee Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2

Conflicts:

	drivers/cfi_flash.c
2006-11-29 09:45:03 +08:00
..
2006-05-30 15:56:48 +02:00
2006-03-12 02:55:22 +01:00
2006-06-10 22:00:40 +02:00
2006-06-16 17:32:31 +02:00
2005-09-25 16:59:36 +02:00
2006-07-21 15:24:56 +02:00
2006-08-15 14:15:51 +02:00
2006-08-23 10:39:01 -05:00
2006-08-15 14:15:51 +02:00
2005-10-04 23:10:28 +02:00
2005-10-05 02:00:09 +02:00
2006-07-12 15:26:01 +02:00
2006-04-16 10:51:58 +02:00
2005-10-13 16:45:02 +02:00
2006-10-11 14:15:21 +02:00
2005-10-11 19:09:42 +02:00
2005-10-28 22:30:33 +02:00
2006-07-19 13:50:38 +02:00
2006-06-26 10:54:52 +02:00
2005-09-22 09:04:17 +02:00
2006-11-02 19:01:33 +08:00
2005-09-23 11:05:55 +02:00
2006-07-21 15:24:56 +02:00