linux/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
asus_oled
ath6kl
bcm
brcm80211
comedi
cptm1217
crystalhd
cs5535_gpio
cx25821
cxd2099
cxt1e1
dt3155v4l
easycap
echo
et131x
frontier
ft1000
generic_serial
gma500
go7007
hv
iio
intel_sst
keucr
line6
lirc
mei
msm
nvec
octeon
olpc_dcon
panel
phison
pohmelfs
quatech_usb2
quickstart
rtl8187se
rtl8192e
rtl8192u
rtl8712
rts_pstor
sbe-2t3e3
sep
serqt_usb2
slicoss
sm7xx
solo6x10
speakup
spectra
ste_rmi4
tidspbridge
tm6000
tty
usbip
vme
vt6655
vt6656
westbridge
winbond
wlags49_h2
wlags49_h25
wlan-ng
xgifb
zcache
zram
Kconfig
Makefile
staging.c