Merge commit 'v2.6.31-rc1' into dmaengine

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

Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)

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

Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
author Dan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
committer Dan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
diff --cc drivers/dma/Kconfig
Simple merge
diff --cc drivers/dma/Makefile

index d7bc5fd17d846fe3cceb3c426a64884bc39641be,a0b6564800c4871f967bbe7d5cf401ea59fd6314..40e1e008357192b1aced8b1abab5a86460c78352
--- 1/drivers/dma/Makefile
--- 2/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -7,5 -7,5 +7,6 @@@ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adm
   obj-$(CONFIG_FSL_DMA) += fsldma.o
   obj-$(CONFIG_MV_XOR) += mv_xor.o
   obj-$(CONFIG_DW_DMAC) += dw_dmac.o
+ +obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
   obj-$(CONFIG_MX3_IPU) += ipu/
+ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
author	Dan Williams <dan.j.williams@intel.com>
	Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
committer	Dan Williams <dan.j.williams@intel.com>
	Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
		1	2
drivers/dma/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history