Skip to content
Snippets Groups Projects
Commit 9c4fe5cc authored by Kenneth Johansson's avatar Kenneth Johansson
Browse files

Merge branch 'mediatek' into ex300 

Conflicts:
 drivers/mtd/nand/Makefile
 drivers/mtd/nand/nand_bbt.c
 tools/env/fw_env.c

conflicts fixed.
parents 01c50755 d8780739
Branches
Tags
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3329 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment