aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-14 20:05:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-14 20:05:39 -0400
commit65e0b598bdb3fe1122ab9a9708fc785e7ac41671 (patch)
tree938f939493d27900fdfa50232158483e82b68697 /include/linux
parentd7a4b63b5138e29122e72a5192d98be86ca68cca (diff)
parent99d389640b58052884fb231bce9dbffb4f595aa4 (diff)
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: mtd: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined mtd: mxc_nand: configure pages per block for v2 controller mtd: OneNAND: Fix loop hang when DMA error at Samsung SoCs mtd: OneNAND: Fix 2KiB pagesize handling at Samsung SoCs mtd: Blackfin NFC: fix invalid free in remove() mtd: Blackfin NFC: fix build error after nand_scan_ident() change mxc_nand: Do not do byte accesses to the NFC buffer.
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions