| commit | 4397989fc91ed289909ecf307c2dc21cee0e7905 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 05 13:23:16 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 05 13:23:16 2009 -0800 |
| tree | fc28a1e179caa3570146ece045cd2bf198f6bd89 | |
| parent | 1bbc9a66d0194449f32c2aa18be40db5744dbd85 [diff] | |
| parent | de19d02b731478877ce8b1ccf371c2b2142ac80e [diff] |
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