diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:43:25 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:43:25 +0200 |
| commit | d64c5097ff1701ae54d02d36f68184756e6a80f0 (patch) | |
| tree | 15c2c7f83c72c47c01f2a236db752a31af613aeb /drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | |
| parent | 64685273186b71b75734771ca21823cec2d994c3 (diff) | |
| parent | 6f112a08c1ed717a015dae190e289d53085c1bc4 (diff) | |
| download | blackbird-op-linux-d64c5097ff1701ae54d02d36f68184756e6a80f0.tar.gz blackbird-op-linux-d64c5097ff1701ae54d02d36f68184756e6a80f0.zip | |
Merge tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/soc
Merge "First little batch of SoC changes for 4.4" from Nicolas Ferre:
- a MAINTAINER addition to cover SAMA5 SoCs
- removal of one unneeded header file
- for low-level serial output, use the DEBUG_UART_PHYS
* tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: debug: use DEBUG_UART_PHYS
ARM: at91: remove useless includes in platform_data/atmel.h
MAINTAINERS: explicitly add Atmel SAMA5
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_surface.c')
0 files changed, 0 insertions, 0 deletions
