diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-09 13:23:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-09 13:23:50 -0700 |
| commit | 510ec7bc3bf6bc6d87662d16a6136135d747e535 (patch) | |
| tree | c57d936028021c4f06c7bc4a020c431deecf4d35 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 94c8a984ae2adbd9a9626fb42e0f2faf3e36e86f (diff) | |
| parent | 80b4f81a49809774f1b123c456fb179e472dbd0e (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
mtd: atmel_nand: use CPU I/O when buffer is in vmalloc(ed) region
mtd: atmel_nand: modify test case for using DMA operations
mtd: atmel_nand: fix support for CPUs that do not support DMA access
mtd: atmel_nand: trivial: change DMA usage information trace
mtd: mtdswap: fix printk format warning
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
0 files changed, 0 insertions, 0 deletions