diff options
| author |   Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 12:39:49 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-13 12:39:49 +0530 |
| commit | 1f3d6dc0be92f0caca937926cca16ec4fdd585a3 (patch) | |
| tree | a12562009ae984dd16ed080af13d0036b88a93a7 /arch/um/kernel/process.c | |
| parent | Revert "drivers/dma: linux/module.h included twice" (diff) | |
| parent | dmaengine: fix for cookie changes and merge (diff) | |
| download | wireguard-linux-1f3d6dc0be92f0caca937926cca16ec4fdd585a3.tar.xz wireguard-linux-1f3d6dc0be92f0caca937926cca16ec4fdd585a3.zip | |
Merge branch 'rmk_cookie_fixes2' into next
Conflicts:
drivers/dma/imx-dma.c
drivers/dma/pl330.c
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'arch/um/kernel/process.c')
0 files changed, 0 insertions, 0 deletions