Merge branches 'fsldma' and 'intel-mid' into dmaengine

author Dan Williams <dan.j.williams@intel.com>

Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)

committer Dan Williams <dan.j.williams@intel.com>

Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)
author Dan Williams <dan.j.williams@intel.com>
Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)
committer Dan Williams <dan.j.williams@intel.com>
Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)
diff --cc drivers/dma/intel_mid_dma.c
Simple merge
author	Dan Williams <dan.j.williams@intel.com>
	Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)
committer	Dan Williams <dan.j.williams@intel.com>
	Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)