aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/namespaces
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-05-21 10:18:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-21 10:18:01 -0300
commitf2b3c6d2943166b25a574cc44ae69e06ead058dc (patch)
treed43cdead5029da2d2b27a7cae8886570bdab8a0b /Documentation/namespaces
parent4fcfa8824391ef0f9cff82122067f31c6d920921 (diff)
parent7fa1d32ae067204d72a7a52fcf630d8ca01921a5 (diff)
Merge branch 'master' of ../linux-nextnext-2010-05-20
* 'master' of ../linux-next: (9980 commits) input: fix error at the default input_get_keycode call input: unlock on error paths input: Add support for EVIO[CS]GKEYCODEBIG V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers V4L/DVB: vivi and mem2mem_testdev need slab.h to build V4L/DVB: tm6000: bugfix image position V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET V4L/DVB: tm6000: README - add vbi V4L/DVB: Fix unlock logic at medusa_video_init V4L/DVB: fix dvb frontend lockup V4L/DVB: s2255drv: remove dead code V4L/DVB: s2255drv: return if vdev not found V4L/DVB: ov511: cleanup: remove unneeded null check V4L/DVB: media/mem2mem: dereferencing free memory V4L/DVB: media/IR: Add missing include file to rc-map.c V4L/DVB: dvb/stv6110x: cleanup error handling V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig V4L/DVB: ngene: start separating out DVB functions into separate file V4L/DVB: ngene: split out card specific code into a separate file V4L/DVB: ngene: split out i2c code into a separate file ... Conflicts: drivers/input/evdev.c drivers/input/input.c drivers/media/IR/ir-core-priv.h drivers/media/IR/ir-keytable.c drivers/media/IR/ir-sysfs.c drivers/media/dvb/dm1105/dm1105.c drivers/media/dvb/dvb-usb/af9015.c drivers/media/dvb/frontends/stv090x.c drivers/media/dvb/ngene/ngene-core.c drivers/media/radio/radio-timb.c drivers/media/radio/saa7706h.c drivers/media/video/cx18/cx18-alsa-main.c drivers/media/video/davinci/dm644x_ccdc.c drivers/media/video/davinci/vpfe_capture.c drivers/media/video/gspca/sonixj.c drivers/media/video/gspca/zc3xx.c drivers/media/video/meye.c drivers/media/video/soc_camera.c drivers/media/video/tlg2300/pd-alsa.c drivers/media/video/tlg2300/pd-dvb.c drivers/media/video/tlg2300/pd-video.c drivers/media/video/tvp7002.c drivers/media/video/w9966.c drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/timberdale.c drivers/staging/cx25821/cx25821-audio-upstream.c drivers/staging/cx25821/cx25821-audups11.c drivers/staging/cx25821/cx25821-video-upstream.c drivers/staging/tm6000/tm6000-video.c include/linux/input.h Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/namespaces')
0 files changed, 0 insertions, 0 deletions

Privacy Policy