Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Thu, 7 Oct 2010 22:19:01 +0000 (15:19 -0700)
committerDan Williams <dan.j.williams@intel.com>
Thu, 7 Oct 2010 22:19:01 +0000 (15:19 -0700)
commit6391987d6f8ced7d0fafaa1440dcc57bb4b34d8f
tree027a3989fceb18c45cf6d435a87b9879e38b8216
parent9646b7985e906e5fcea9375f016b4519c8318c21
parente8689e63d4d2046079f2db9d494ac05c6885ac0c
parent0d688662aab9d80078be82aa5aea561346643298
parent1f1846c6ceed07c03ef036a27864befe0f773997
parent20dd63900d238e17b122fe0c7376ff090867f528
Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengine
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/dma/dmaengine.c
drivers/dma/ste_dma40.c
include/linux/dmaengine.h