kernel-ark/drivers/staging
Linus Torvalds 338c09a94b Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull OMAP3 updates from Mauro Carvalho Chehab:
 "Some driver improvements on OMAP3.  This series depend on some iommu
  patches already merged"

* 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (26 commits)
  [media] omap3isp: Rename isp_buffer isp_addr field to dma
  [media] omap3isp: Move to videobuf2
  [media] v4l: vb2: Add a function to discard all DONE buffers
  [media] omap3isp: Cancel all queued buffers when stopping the video stream
  [media] omap3isp: Move buffer irqlist to isp_buffer structure
  [media] omap3isp: Move queue irqlock to isp_video structure
  [media] omap3isp: Move queue mutex to isp_video structure
  [media] omap3isp: queue: Don't build scatterlist for kernel buffer
  [media] omap3isp: Use the ARM DMA IOMMU-aware operations
  [media] omap3isp: queue: Use sg_alloc_table_from_pages()
  [media] omap3isp: queue: Map PFNMAP buffers to device
  [media] omap3isp: queue: Fix the dma_map_sg() return value check
  [media] omap3isp: queue: Allocate kernel buffers with dma_alloc_coherent
  [media] omap3isp: queue: Inline the ispmmu_v(un)map functions
  [media] omap3isp: queue: Merge the prepare and sglist functions
  [media] omap3isp: queue: Use sg_table structure
  [media] omap3isp: queue: Move IOMMU handling code to the queue
  [media] omap3isp: video: Set the buffer bytesused field at completion time
  [media] omap3isp: ccdc: Use the DMA API for FPC
  [media] omap3isp: ccdc: Use the DMA API for LSC
  ...
2014-06-12 23:04:28 -07:00
..
android Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next 2014-06-03 14:00:15 -07:00
bcm
ced1401
comedi Merge branch 'next' (accumulated 3.16 merge window patches) into master 2014-06-08 11:31:16 -07:00
cptm1217
crystalhd
cxt1e1
dgap Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()" 2014-05-29 13:59:03 -07:00
dgnc
dgrp
et131x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
frontier Staging/frontier/tranzport: coding style fixes 2014-05-28 14:30:33 -07:00
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
fwserial
gdm72xx
gdm724x
goldfish
gs_fpgaboot
iio
imx-drm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2014-06-12 11:32:30 -07:00
keucr
line6
lustre Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2014-06-12 10:30:18 -07:00
media Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2014-06-12 23:04:28 -07:00
mt29f_spinand staging/mt29f_spinand: coding style fixes 2014-06-01 16:46:57 -07:00
netlogic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
nokia_h4p
nvec
octeon
octeon-usb
olpc_dcon
ozwpan
panel
phison
quickstart
rtl8188eu staging: rtl8188eu: Remove unneeded version.h inclusion 2014-05-28 14:30:32 -07:00
rtl8192e Merge branch 'next' (accumulated 3.16 merge window patches) into master 2014-06-08 11:31:16 -07:00
rtl8192ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
rtl8192u Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace 2014-05-29 13:43:23 -07:00
rtl8712
rtl8723au Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
rtl8821ae Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
rts5208
sep
serqt_usb2
silicom staging: silicom: fix sparse warning for static variable 2014-06-01 16:46:56 -07:00
skein staging: skein: fix sparse warning for static declarations 2014-06-01 16:58:59 -07:00
slicoss
speakup Merge branch 'next' (accumulated 3.16 merge window patches) into master 2014-06-08 11:31:16 -07:00
ste_rmi4
tidspbridge
unisys
usbip USB driver patches for 3.16-rc1 2014-06-03 09:11:20 -07:00
vme
vt6655 staging: vt6655: refactor iwctl_giwaplist() to avoid -Wframe-larger-than warn. 2014-05-28 14:10:46 -07:00
vt6656 staging: vt6656: rf.c replace DBG_PRT debug messages 2014-05-28 14:10:46 -07:00
winbond
wlags49_h2
wlags49_h25
wlan-ng Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-06-12 14:27:40 -07:00
xgifb
xillybus
Kconfig
Makefile
staging.c