Merge branch 'for-linus' into next
authorVinod Koul <vinod.koul@intel.com>
Wed, 30 Oct 2013 07:37:18 +0000 (13:07 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 30 Oct 2013 07:37:18 +0000 (13:07 +0530)
commitb967aecf1714c10d1e6c045e43b6385884f1ca77
treea6aebedea9c5ddd1bbaf42e913be01e17f98c735
parent959f58544b7f20c92d5eb43d1232c96c15c01bfb
parent2abd5f1b97fce6e197be01d67a9567c7793c80d3
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>
drivers/dma/edma.c