Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332647
b: refs/heads/master
c: 9d9a881
h: refs/heads/master
i:
  332645: 8d1095e
  332643: 6d68b29
  332639: cb6938f
v: v3
  • Loading branch information
Brian Norris authored and David Woodhouse committed Jul 6, 2012
1 parent da8fa58 commit 1e63fb1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e61c3a57747150a583b2fb54bddb5dba09aa2cf
refs/heads/master: 9d9a8811622e36611e8eeb2401e4e9805d4727f3
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/nand/nand_ids.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_STMICRO, "ST Micro"},
{NAND_MFR_HYNIX, "Hynix"},
{NAND_MFR_MICRON, "Micron"},
{NAND_MFR_AMD, "AMD"},
{NAND_MFR_AMD, "AMD/Spansion"},
{NAND_MFR_MACRONIX, "Macronix"},
{NAND_MFR_EON, "Eon"},
{0x0, "Unknown"}
Expand Down

0 comments on commit 1e63fb1

Please sign in to comment.