diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-12-26 14:09:28 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-12-26 14:09:28 -0200 |
| commit | 0e0694ff1a7791274946b7f51bae692da0001a08 (patch) | |
| tree | 53d28f58d793c151aa870f17d38ddec6ac01ec7a /kernel/trace/tracing_map.c | |
| parent | 65390ea01ce678379da32b01f39fcfac4903f256 (diff) | |
| parent | c739c0a7c3c2472d7562b8f802cdce44d2597c8b (diff) | |
Merge branch 'patchwork' into v4l_for_linus
* patchwork:
[media] s5k4ecgx: select CRC32 helper
[media] dvb: avoid warning in dvb_net
[media] v4l: tvp5150: Don't override output pinmuxing at stream on/off time
[media] v4l: tvp5150: Fix comment regarding output pin muxing
[media] v4l: tvp5150: Reset device at probe time, not in get/set format handlers
[media] pctv452e: move buffer to heap, no mutex
[media] media/cobalt: use pci_irq_allocate_vectors
[media] cec: fix race between configuring and unconfiguring
[media] cec: move cec_report_phys_addr into cec_config_thread_func
[media] cec: replace cec_report_features by cec_fill_msg_report_features
[media] cec: update log_addr[] before finishing configuration
[media] cec: CEC_MSG_GIVE_FEATURES should abort for CEC version < 2
[media] cec: when canceling a message, don't overwrite old status info
[media] cec: fix report_current_latency
[media] smiapp: Make suspend and resume functions __maybe_unused
[media] smiapp: Implement power-on and power-off sequences without runtime PM
Diffstat (limited to 'kernel/trace/tracing_map.c')