Conflicts:

	arch/arm/mach-tegra/common.c
	drivers/ata/ahci-tegra.c

6 files changed, 82 insertions, 1 deletions

diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h
index 692956b2fc4f..9cc978ec5a7f 100644
--- a/include/linux/nvmap.h
+++ b/include/linux/nvmap.h
@@ -124,6 +124,8 @@ void nvmap_unpin_handles(struct nvmap_client *client,
 struct nvmap_handle_ref *nvmap_duplicate_handle_id(struct nvmap_client *client,
 						   unsigned long id);
 
+int nvmap_mark_global(struct nvmap_client *client, struct nvmap_handle_ref *r);
+
 struct nvmap_platform_carveout {
 	const char *name;
 	unsigned int usage_mask;
diff --git a/include/media/tegra_camera.h b/include/media/tegra_camera.h
index 3c41864cc71f..d47839282382 100644
--- a/include/media/tegra_camera.h
+++ b/include/media/tegra_camera.h
@@ -56,7 +56,7 @@ struct tegra_camera_platform_data {
 #if  defined(CONFIG_TEGRA_CAMERA)
 int is_tegra_camera_on(void);
 #else
-int is_tegra_camera_on(void) { return 0; }
+static inline int is_tegra_camera_on(void) { return 0; }
 #endif
 
 #define TEGRA_CAMERA_IOCTL_ENABLE		_IOWR('i', 1, uint)
diff --git a/include/media/tegra_v4l2_camera.h b/include/media/tegra_v4l2_camera.h
new file mode 100644
index 000000000000..f6390b6e5609
--- /dev/null
+++ b/include/media/tegra_v4l2_camera.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TEGRA_CAMERA_H_
+#define _TEGRA_CAMERA_H_
+
+#include <linux/regulator/consumer.h>
+#include <linux/i2c.h>
+#include <linux/nvhost.h>
+
+enum tegra_camera_port {
+	TEGRA_CAMERA_PORT_CSI_A = 1,
+	TEGRA_CAMERA_PORT_CSI_B,
+	TEGRA_CAMERA_PORT_VIP,
+};
+
+struct tegra_camera_platform_data {
+	int			(*enable_camera)(struct nvhost_device *ndev);
+	void			(*disable_camera)(struct nvhost_device *ndev);
+	bool			flip_h;
+	bool			flip_v;
+	enum tegra_camera_port	port;
+	int			lanes;		/* For CSI port only */
+	bool			continuous_clk;	/* For CSI port only */
+};
+
+#endif /* _TEGRA_CAMERA_H_ */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 63fd9d3db296..fb929eacd2e6 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -77,6 +77,7 @@ enum {
 	V4L2_IDENT_OV2640 = 259,
 	V4L2_IDENT_OV9740 = 260,
 	V4L2_IDENT_OV5642 = 261,
+	V4L2_IDENT_OV5640 = 262,
 
 	/* module saa7146: reserved range 300-309 */
 	V4L2_IDENT_SAA7146 = 300,
diff --git a/include/media/videobuf2-dma-nvmap.h b/include/media/videobuf2-dma-nvmap.h
new file mode 100644
index 000000000000..39ae3d3a1d5d
--- /dev/null
+++ b/include/media/videobuf2-dma-nvmap.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _MEDIA_VIDEOBUF2_DMA_NVMAP_H
+#define _MEDIA_VIDEOBUF2_DMA_NVMAP_H
+
+#include <media/videobuf2-core.h>
+#include <linux/dma-mapping.h>
+
+static inline dma_addr_t
+vb2_dma_nvmap_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no)
+{
+	dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no);
+
+	return *paddr;
+}
+
+void *vb2_dma_nvmap_init_ctx(struct device *dev);
+void vb2_dma_nvmap_cleanup_ctx(void *alloc_ctx);
+
+extern const struct vb2_mem_ops vb2_dma_nvmap_memops;
+
+#endif
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 915d7ae527b3..14bee5ade7c7 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1264,9 +1264,11 @@ struct hci_conn_info {
 	__u8     out;
 	__u16    state;
 	__u32    link_mode;
+#ifdef CONFIG_ANDROID
 	__u32    mtu;
 	__u32    cnt;
 	__u32    pkts;
+#endif
 };
 
 struct hci_dev_req {