diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-10 13:22:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-10 13:22:10 -0800 |
| commit | 9179746652faf0aba07b8b7f770dcf29892a24c6 (patch) | |
| tree | 1e672acf04da22aafce3d1790d76eef4eaeb435b /drivers/s390/char/keyboard.c | |
| parent | 4c418ba9695a24917a1fcfa48f7db3fd76337eb7 (diff) | |
| parent | a4e36e60a6f62db6282e718cc228bde1a4e31eba (diff) | |
Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] mantis_pci: remove asm/pgtable.h include
[media] tda829x: fix regression in probe functions
[media] mceusb: don't claim multifunction device non-IR parts
[media] nuvoton-cir: fix wake from suspend
[media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411
[media] ivtv: Fix corrective action taken upon DMA ERR interrupt to avoid hang
[media] cx25840: fix probing of cx2583x chips
[media] cx23885: Remove unused 'err:' labels to quiet compiler warning
[media] cx23885: Revert "Check for slave nack on all transactions"
[media] DiB7000M: add pid filtering
[media] Fix sysfs rc protocol lookup for rc-5-sz
[media] au0828: fix VBI handling when in V4L2 streaming mode
[media] ir-raw: Properly initialize the IR event (BZ#27202)
[media] s2255drv: firmware re-loading changes
[media] Fix double free of video_device in mem2mem_testdev
[media] DM04/QQBOX memcpy to const char fix
Diffstat (limited to 'drivers/s390/char/keyboard.c')
0 files changed, 0 insertions, 0 deletions