]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 21:23:16 +0000 (13:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 21:23:16 +0000 (13:23 -0800)
commit4397989fc91ed289909ecf307c2dc21cee0e7905
treefc28a1e179caa3570146ece045cd2bf198f6bd89
parent1bbc9a66d0194449f32c2aa18be40db5744dbd85
parentde19d02b731478877ce8b1ccf371c2b2142ac80e
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
drivers/mtd/maps/Kconfig