iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63063bfbff
linux/drivers/staging
History
Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 
Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...
2012-06-25 14:53:09 -07:00
..
android mm/fs: route MADV_REMOVE to FALLOC_FL_PUNCH_HOLE 2012-05-29 16:22:22 -07:00
asus_oled staging: asus_oled.c: remove err() usage 2012-04-23 16:45:54 -07:00
bcm Staging: bcm: Remove two unused variables from Adapter.h 2012-05-18 17:41:16 -07:00
ccg staging: usb: gadget: Add FunctionFS support to Configurable Composite Gadget driver 2012-05-16 05:32:20 -07:00
comedi staging/comedi: fix build for USB not enabled 2012-06-11 16:49:35 -07:00
cptm1217
crystalhd Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
cxt1e1
echo
et131x staging: et131x: Fix coding style issues 2012-05-01 21:48:44 -07:00
frontier staging: frontier: alphatrack.c: remove err() usage 2012-04-23 16:46:11 -07:00
ft1000 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
gdm72xx staging: gdm72xx: Release netlink socket properly 2012-06-14 17:28:46 -07:00
iio staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer 2012-06-12 11:12:19 -07:00
ipack Staging: ipack/bridges/tpci200: remove unneeded casts 2012-05-18 17:38:17 -07:00
keucr
line6 staging: line6/config.h: Delete unused header 2012-05-18 17:13:52 -07:00
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-06-25 14:53:09 -07:00
net NET: pc300, move to staging as it is broken 2012-04-13 10:57:04 -07:00
nvec staging:nvec:nvec.h Fix typos in staging:nvec 2012-04-10 09:29:21 -07:00
octeon Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
olpc_dcon staging: olpc_dcon.c: Remove a few spaces between casts and variables 2012-04-24 11:33:22 -07:00
omapdrm staging: omapdrm: fix crash when freeing bad fb 2012-06-11 08:42:09 -07:00
ozwpan Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
panel staging:panel:panel.c Fix typo in staging:panel 2012-04-10 09:29:21 -07:00
phison
quickstart
ramster Frontswap provides a "transcendent memory" interface for swap pages. 2012-06-04 12:28:45 -07:00
rtl8187se staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8192e staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8192u staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8712 staging: r8712u: Add new USB IDs 2012-06-15 14:50:04 -07:00
rts5139 staging: "rts5139" Fix typos. 2012-05-14 13:31:09 -07:00
rts_pstor Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
sbe-2t3e3 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sep Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
serqt_usb2 USB: serqt_usb2: remove duplicate device ids 2012-05-10 14:13:17 -07:00
slicoss
sm7xx staging: sm7xx: rename function 2012-04-29 21:32:20 -04:00
speakup
ste_rmi4 ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
telephony staging/telephony/ixj.c: delete trailing whitespace 2012-04-10 10:27:58 -07:00
tidspbridge Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
usbip Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures" 2012-06-12 11:10:50 -07:00
vme Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
vt6655 Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
vt6656 staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
winbond
wlags49_h2 Staging: wlags49_h2: potential NULL dereference 2012-05-14 15:43:44 -07:00
wlags49_h25
wlan-ng staging: wlan-ng: Release struct returned by cfg80211_inform_bss to avoid potential memory leak. 2012-04-24 11:28:25 -07:00
xgifb Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
zcache Frontswap provides a "transcendent memory" interface for swap pages. 2012-06-04 12:28:45 -07:00
zram
zsmalloc staging: zsmalloc: add/fix function comment 2012-05-09 13:20:22 -07:00
Kconfig Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
Makefile Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
staging.c