]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bbc9a6 de19d02)
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)
* 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

1  2 
drivers/mtd/maps/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/mtd/maps/Kconfig
Simple merge
Linux Kernel Source Tree.