linux-stable/drivers/staging
Linus Torvalds de3796e77a Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)
  [media] rc: call input_sync after scancode reports
  [media] imon: allow either proto on unknown 0xffdc
  [media] imon: auto-config ffdc 7e device
  [media] saa7134: fix raw IR timeout value
  [media] rc: fix ghost keypresses with certain hw
  [media] [staging] lirc_serial: allocate irq at init time
  [media] lirc_zilog: fix spinning rx thread
  [media] keymaps: fix table for pinnacle pctv hd devices
  [media] ite-cir: 8709 needs to use pnp resource 2
  [media] V4L: mx1-camera: fix uninitialized variable
  [media] omap_vout: Added check in reqbuf & mmap for buf_size allocation
  [media] OMAP_VOUT: Change hardcoded device node number to -1
  [media] OMAP_VOUTLIB: Fix wrong resizer calculation
  [media] uvcvideo: Disable the queue when failing to start
  [media] uvcvideo: Remove buffers from the queues when freeing
  [media] uvcvideo: Ignore entities for terminals with no supported format
  [media] v4l: Don't access media entity after is has been destroyed
  [media] media: omap3isp: fix a potential NULL deref
  [media] media: vb2: fix allocation failure check
  [media] media: vb2: reset queued_count value during queue reinitialization
  ...

Fix up trivial conflict in MAINTAINERS as per Mauro
2011-07-06 12:16:49 -07:00
..
altera-stapl Staging: altera: move .h file to proper place 2011-06-07 12:19:14 -07:00
asus_oled
ath6kl staging: ath6kl: Fix a kernel panic during suspend/resume 2011-06-07 12:28:42 -07:00
bcm
brcm80211 Staging: brcm80211: disable drivers except for X86 or MIPS platforms 2011-06-27 14:34:42 -07:00
comedi Staging: comedi: fix build breakages on some platforms 2011-06-27 14:43:34 -07:00
cptm1217 drivers/staging/cptm1217/clearpad_tm1217.c: Correct call to input_free_device 2011-05-18 14:30:49 -07:00
crystalhd
cs5535_gpio
cx25821
cxd2099
cxt1e1
dt3155v4l
easycap staging/easycap: easycap_probe: drop more unused variables 2011-05-18 14:30:08 -07:00
echo staging: echo: Trivial indentation changes 2011-05-17 13:31:29 -07:00
et131x
frontier
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2011-05-24 13:28:35 -07:00
generic_serial Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2011-05-26 13:19:00 -07:00
gma500 staging: gma500: get control from firmware framebuffer if conflicts 2011-06-07 12:28:42 -07:00
go7007
hv Staging: hv: vmbus_drv: Get rid of util synchronixation based on channel counting 2011-05-17 13:36:50 -07:00
iio Staging: iio: Make IIO depend on GENERIC_HARDIRQS 2011-06-27 14:19:21 -07:00
intel_sst Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-23 12:49:28 -07:00
keucr staging/keucr: fix transport other code style 2011-05-18 08:22:41 -07:00
line6 drivers/staging/line6/driver.c: Drop unneeded put functions. 2011-05-17 13:31:32 -07:00
lirc [media] [staging] lirc_serial: allocate irq at init time 2011-07-01 16:32:45 -03:00
mei Staging: mei: fix suspend failure 2011-06-27 14:19:21 -07:00
msm
nvec Staging: initial version of the nvec driver 2011-05-19 15:36:10 -07:00
octeon
olpc_dcon staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE 2011-06-07 12:28:39 -07:00
panel
phison
pohmelfs sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
quatech_usb2
quickstart
rtl8187se
rtl8192e
rtl8192u
rtl8712
rts_pstor staging: rts_pstor: use bitwise operator instead of logical one 2011-06-07 12:28:40 -07:00
sbe-2t3e3
sep
serqt_usb2
slicoss
sm7xx Staging: sm7xx: printk loglevels modified to match the scenario 2011-05-19 15:34:32 -07:00
solo6x10
speakup
spectra
ste_rmi4
tidspbridge
tm6000 [media] tm6000: fix uninitialized field, change prink to dprintk 2011-05-21 07:24:19 -03:00
tty Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-23 12:49:28 -07:00
usbip staging: usbip: bugfix prevent driver unbind 2011-06-07 12:28:41 -07:00
vme
vt6655
vt6656 drivers/staging/vt6656/main_usb.c: Delete unnecessary call to usb_kill_urb 2011-05-17 11:37:57 -07:00
westbridge
winbond
wlags49_h2
wlags49_h25
wlan-ng Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-05-24 16:47:54 -04:00
xgifb
zcache vmscan: change shrinker API by passing shrink_control struct 2011-05-25 08:39:26 -07:00
zram
Kconfig Staging: remove STAGING_EXCLUDE_BUILD option 2011-06-07 12:23:57 -07:00
Makefile Staging: initial version of the nvec driver 2011-05-19 15:36:10 -07:00
staging.c