Commit 4397989f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32 

* git://git.infradead.org/users/dwmw2/mtd-2.6.32:
  mtd/maps: gpio-addr-flash: depend on GPIO arch support
  mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/
  mtd: nand: fix htmldocs warnings
parents 1bbc9a66 de19d02b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

CRA Git | Maintained and supported by SUSTech CRA and CCSE