tmp_suning_uos_patched/drivers/dma
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
ioat drivers/dma/ioat: Use the ccflag-y instead of EXTRA_CFLAGS 2010-12-04 15:03:06 -08:00
ipu
ppc4xx drivers/dma/ppc4xx: Use printf extension %pR for struct resource 2010-12-04 15:03:40 -08:00
amba-pl08x.c
at_hdmac_regs.h
at_hdmac.c dmaengine: at_hdmac: fix buffer transfer size specification 2010-12-14 00:39:29 -08:00
coh901318_lli.c
coh901318_lli.h
coh901318.c
dmaengine.c
dmatest.c
dw_dmac_regs.h
dw_dmac.c
fsldma.c fsldma: fix issue of slow dma 2010-12-13 14:05:27 -08:00
fsldma.h fsldma: fix issue of slow dma 2010-12-13 14:05:27 -08:00
imx-dma.c
imx-sdma.c Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable 2011-01-05 10:23:38 +00:00
intel_mid_dma_regs.h
intel_mid_dma.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
iop-adma.c
iovlock.c
Kconfig powerpc/512x: add MPC8308 dma support 2010-12-29 22:29:02 -07:00
Makefile
mpc512x_dma.c powerpc/512x: try to free dma descriptors in case of allocation failure 2010-12-29 22:29:36 -07:00
mv_xor.c mv_xor: fix race in tasklet function 2011-01-03 01:39:26 -08:00
mv_xor.h
pch_dma.c dma : EG20T PCH: Fix miss-setting DMA descriptor 2010-12-07 15:07:08 -08:00
pl330.c
shdma.c dma: shdma: don't register the global die notifier multiple times 2011-01-07 11:03:26 +09:00
shdma.h dma: shdma: NMI support. 2010-12-17 19:16:10 +09:00
ste_dma40_ll.c
ste_dma40_ll.h
ste_dma40.c
timb_dma.c
txx9dmac.c
txx9dmac.h