drm: Branch 'master'

[<coo...@ke...>]

 exynos/exynos_drm.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 881e69f185d2450ca35964caf254b04e7e8838c1
Author: Cooper Yuan <coo...@gm...>
Date:   Fri Jul 6 16:26:49 2012 +0200

    libdrm/exynos: padding gem_mmap structure to 64-bit aligned

diff --git a/exynos/exynos_drm.h b/exynos/exynos_drm.h
index dc2eef3..aa97b22 100644
--- a/exynos/exynos_drm.h
+++ b/exynos/exynos_drm.h
@@ -64,6 +64,7 @@ struct drm_exynos_gem_map_off {
  * A structure for mapping buffer.
  *
  * @handle: a handle to gem object created.
+ * @pad: just padding to be 64-bit aligned.
  * @size: memory size to be mapped.
  * @mapped: having user virtual address mmaped.
  *	- this variable would be filled by exynos gem module
@@ -72,7 +73,8 @@ struct drm_exynos_gem_map_off {
  */
 struct drm_exynos_gem_mmap {
 	unsigned int handle;
-	unsigned int size;
+	unsigned int pad;
+	uint64_t size;
 	uint64_t mapped;
 };