Merge branch 'ioat' into fixes
Dan Williams [Wed, 23 Dec 2009 00:21:47 +0000 (17:21 -0700)]
1  2 
drivers/dma/Kconfig
drivers/dma/shdma.c

Simple merge
Simple merge