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)
commitf80ca163d65903276bec7045a484a79c0897eb2d
tree97c7d61d43248b9db0757a76af80ff58b98b5599
parent0794ec8ce327ec74416b569b8fb1951274693700
parenta6d52d70677e99bdb89b6921c265d0a58c22e597
Merge branch 'ioat' into fixes
drivers/dma/Kconfig
drivers/dma/shdma.c