Merge commit 'v2.6.31-rc1' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
commita348a7e6fdbcd2d5192a09719a479bb238fde727
tree5ff94185f4e5a810777469d7fe7832a8ec2d3430
parent808347f6a31792079e345ec865e9cfcb6e8ae6b2
parent28d0325ce6e0a52f53d8af687e6427fee59004d3
Merge commit 'v2.6.31-rc1' into dmaengine
drivers/dma/Kconfig
drivers/dma/Makefile