diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 08:37:18 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 08:37:18 +0100 |
| commit | b967aecf1714c10d1e6c045e43b6385884f1ca77 (patch) | |
| tree | a6aebedea9c5ddd1bbaf42e913be01e17f98c735 /net/compat.c | |
| parent | Linux 3.12-rc7 (diff) | |
| parent | dma: edma: Increase maximum SG limit to 20 (diff) | |
| download | linux-b967aecf1714c10d1e6c045e43b6385884f1ca77.tar.xz linux-b967aecf1714c10d1e6c045e43b6385884f1ca77.zip | |
Merge branch 'for-linus' into next
Conflicts:
drivers/dma/edma.c
Moved the memory leak fix post merge
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'net/compat.c')
0 files changed, 0 insertions, 0 deletions