David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
bestcomm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-02-23 17:09:55 -08:00
ioat	ioat/dca: Update DCA BIOS workarounds to use TAINT_FIRMWARE_WORKAROUND	2013-03-22 12:55:38 -04:00
ipu
ppc4xx
sh	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
amba-pl08x.c
at_hdmac_regs.h
at_hdmac.c
coh901318_lli.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
coh901318.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
coh901318.h
dmaengine.c	dmaengine: convert to idr_alloc()	2013-02-27 19:10:15 -08:00
dmaengine.h
dmatest.c
dw_dmac_regs.h	dw_dmac: adjust slave_id accordingly to request line base	2013-03-30 04:34:07 +05:30
dw_dmac.c	dw_dmac: adjust slave_id accordingly to request line base	2013-03-30 04:34:07 +05:30
edma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
ep93xx_dma.c
fsldma.c
fsldma.h
imx-dma.c
imx-sdma.c
intel_mid_dma_regs.h
intel_mid_dma.c
iop-adma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
iovlock.c
Kconfig	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
Makefile	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
mmp_pdma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
mmp_tdma.c
mpc512x_dma.c
mv_xor.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
mv_xor.h
mxs-dma.c
of-dma.c	dma: of-dma: protect list write operation by spin_lock	2013-02-14 20:00:53 +05:30
omap-dma.c
pch_dma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
pl330.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
sa11x0-dma.c
sirf-dma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
ste_dma40_ll.c
ste_dma40_ll.h
ste_dma40.c	dmaengine: ste_dma40: do not remove descriptors for cyclic transfers	2013-02-14 19:54:31 +05:30
tegra20-apb-dma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
timb_dma.c
TODO
txx9dmac.c
txx9dmac.h
virt-dma.c
virt-dma.h