mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 15:39:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.6-rc3' into drm-next

Browse Source 
Backmerge 4.6-rc3 for i915.

Linux 4.6-rc3
This commit is contained in:
Dave Airlie
2016-04-22 08:32:51 +10:00
parent d57d47735e bf16200689
commit 49047962ec
697 changed files with 7476 additions and 4787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/drm/ttm/ttm_bo_api.h
View File

@@ -92,7 +92,7 @@ struct ttm_placement {
*/
struct ttm_bus_placement {
void *addr;
unsigned long base;
phys_addr_t base;
unsigned long size;
unsigned long offset;
bool is_iomem;