summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2016-03-05 00:36:02 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2016-03-05 00:36:02 +0100
commit1b3bf847977c2e5974012ddd4b25fef50967d785 (patch)
tree002204c6ef868702ad3cb23405c66c819a155ffe /drivers/media
parentLinux 4.5-rc4 (diff)
parentARM: 8524/1: driver cohandle -EPROBE_DEFER from bus_type.match() (diff)
parentARM: 8544/1: set_memory_xx fixes (diff)
parentARM: 8546/1: dma-mapping: refactor to fix coherent+cma+gfp=0 (diff)
parentARM: l2c: tauros2: use descriptive definitions for register bits (diff)
downloadlinux-1b3bf847977c2e5974012ddd4b25fef50967d785.tar.xz
linux-1b3bf847977c2e5974012ddd4b25fef50967d785.zip
Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next