aboutsummaryrefslogtreecommitdiff
path: root/Documentation/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:23:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:23:16 -0800
commit4397989fc91ed289909ecf307c2dc21cee0e7905 (patch)
treefc28a1e179caa3570146ece045cd2bf198f6bd89 /Documentation/acpi
parent1bbc9a66d0194449f32c2aa18be40db5744dbd85 (diff)
parentde19d02b731478877ce8b1ccf371c2b2142ac80e (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
Diffstat (limited to 'Documentation/acpi')
0 files changed, 0 insertions, 0 deletions