]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'ioat' into fixes
authorDan Williams <dan.j.williams@intel.com>
Wed, 23 Dec 2009 00:21:47 +0000 (17:21 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 23 Dec 2009 00:21:47 +0000 (17:21 -0700)
1  2 
drivers/dma/Kconfig
drivers/dma/shdma.c

Simple merge
Simple merge