Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
ioat	drivers/dma/ioat: Use the ccflag-y instead of EXTRA_CFLAGS	2010-12-04 15:03:06 -08:00
ipu	dma: ipu_idmac: do not lose valid received data in the irq handler	2011-02-14 02:28:16 -08:00
ppc4xx	dt/powerpc: Eliminate users of of_platform_{,un}register_driver	2011-02-28 01:36:39 -07:00
amba-pl08x.c	ARM: amba: make probe() functions take const id tables	2011-02-23 16:24:14 +00:00
at_hdmac_regs.h	at_hdmac: implement a private tx_list	2009-09-08 17:53:03 -07:00
at_hdmac.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-01-17 10:54:41 -08:00
coh901318_lli.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
coh901318_lli.h	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
coh901318.c	coh901318.c: Change initate to initiate.	2011-02-17 16:50:49 +01:00
dmaengine.c	async_tx: make async_tx channel switching opt-in	2010-10-07 17:08:32 -07:00
dmatest.c	dma: dmatest: fix potential sign bug	2010-08-04 14:27:47 -07:00
dw_dmac_regs.h	dw_dmac: implement a private tx_list	2009-09-08 17:53:02 -07:00
dw_dmac.c	DMAENGINE: extend the control command to include an arg	2010-05-17 16:30:42 -07:00
fsldma.c	dt/powerpc: Eliminate users of of_platform_{,un}register_driver	2011-02-28 01:36:39 -07:00
fsldma.h	fsldma: fix issue of slow dma	2010-12-13 14:05:27 -08:00
imx-dma.c	dmaengine i.MX dma: initialize dma capabilities outside channel loop	2011-01-31 12:36:23 +01:00
imx-sdma.c	Merge branch 'imx' into dmaengine-fixes	2011-02-14 02:40:46 -08:00
intel_mid_dma_regs.h	intel_mid_dma: change the slave interface	2010-10-07 15:03:44 -07:00
intel_mid_dma.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-01-17 10:54:41 -08:00
iop-adma.c	Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c	2011-01-14 17:58:12 -08:00
iovlock.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-01-17 10:54:41 -08:00
Makefile	dma: change to new flag variable	2011-03-17 14:02:59 +01:00
mpc512x_dma.c	dt/powerpc: Eliminate users of of_platform_{,un}register_driver	2011-02-28 01:36:39 -07:00
mv_xor.c	mv_xor: fix race in tasklet function	2011-01-03 01:39:26 -08:00
mv_xor.h	mv_xor: implement a private tx_list	2009-09-08 17:53:03 -07:00
pch_dma.c	pch_dma: support new device ML7213 IOH	2011-01-14 16:24:53 -08:00
pl330.c	ARM: amba: make probe() functions take const id tables	2011-02-23 16:24:14 +00:00
shdma.c	Comment typo fixes for 'descriptor'	2011-01-19 15:37:19 +01:00
shdma.h	dma: shdma: NMI support.	2010-12-17 19:16:10 +09:00
ste_dma40_ll.c	dmaengine: dma40: Add support to split up large elements	2011-01-04 17:20:43 -08:00
ste_dma40_ll.h	dmaengine: dma40: Add support to split up large elements	2011-01-04 17:20:43 -08:00
ste_dma40.c	dmaengine: dma40: Add support to split up large elements	2011-01-04 17:20:43 -08:00
timb_dma.c	Remove one to many n's in a word	2011-03-01 15:47:58 +01:00
txx9dmac.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-05-21 17:05:46 -07:00
txx9dmac.h	txx9dmac: implement a private tx_list	2009-09-08 17:53:03 -07:00