projects / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60df4f8 3aa8b68)
Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Wed, 2 Sep 2009 08:56:09 +0000 (17:56 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Wed, 2 Sep 2009 08:56:09 +0000 (17:56 +0900)
Conflicts:

drivers/mtd/onenand/onenand_base.c
include/linux/mtd/onenand.h

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
1  2 
Makefile patch | diff1 | diff2 | blob | history
drivers/mtd/onenand/onenand_base.c patch | diff1 | diff2 | blob | history
include/linux/mtd/onenand.h patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc drivers/mtd/onenand/onenand_base.c
Simple merge
diff --cc include/linux/mtd/onenand.h
Simple merge
Domain: System / Kernel;