diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-15 11:13:54 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-15 11:13:54 +0200 |
| commit | f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e (patch) | |
| tree | c56a58601b743997051a94532d4cb9b27f9a4635 /block/blk-timeout.c | |
| parent | Linux 3.11-rc1 (diff) | |
| parent | mm/cma: Move dma contiguous changes into a seperate config (diff) | |
| download | linux-f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e.tar.xz linux-f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e.zip | |
Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
Conflicts:
mm/Kconfig
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions