Merge branches 'fsldma' and 'intel-mid' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)
committerDan Williams <dan.j.williams@intel.com>
Wed, 8 Dec 2010 01:10:52 +0000 (17:10 -0800)
1  2  3 
drivers/dma/intel_mid_dma.c

Simple merge