Commit 0d09eb7a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge branch 'perf/urgent' into perf/core 



Merge Reason: to pick the fix:

 commit e7f01d1e
     perf tools: Use scnprintf where applicable

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 9521d830 89c5bd08

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2845,6 +2845,12 @@ S: Maintained 
F:	drivers/media/video/m5mols/

F:	include/media/m5mols.h



FUJITSU TABLET EXTRAS

M:	Robert Gerlach <khnz@gmx.de>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

F:	drivers/platform/x86/fujitsu-tablet.c



FUSE: FILESYSTEM IN USERSPACE

M:	Miklos Szeredi <miklos@szeredi.hu>

L:	fuse-devel@lists.sourceforge.net

arch/arm/mach-shmobile/board-ag5evm.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/sh_clk.h>

#include <linux/videodev2.h>

#include <video/sh_mobile_lcdc.h>

#include <video/sh_mipi_dsi.h>

#include <sound/sh_fsi.h>

arch/arm/mach-shmobile/board-ap4evb.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static struct fsi_ak4642_info fsi2_ak4643_info = { 
static struct platform_device fsi_ak4643_device = {

	.name	= "fsi-ak4642-audio",

	.dev	= {

		.platform_data	= &fsi_info,

		.platform_data	= &fsi2_ak4643_info,

	},

};

arch/arm/mach-shmobile/board-bonito.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/smsc911x.h>

#include <linux/videodev2.h>

#include <mach/common.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -241,7 +242,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = { 
	.clock_source	= LCDC_CLK_BUS,

	.ch[0] = {

		.chan			= LCDC_CHAN_MAINLCD,

		.bpp			= 16,

		.fourcc = V4L2_PIX_FMT_RGB565,

		.interface_type		= RGB24,

		.clock_divider		= 5,

		.flags			= 0,

arch/arm/mach-shmobile/board-mackerel.c

+4 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,10 @@ static struct map_desc mackerel_io_desc[] __initdata = { 
static void __init mackerel_map_io(void)

{

	iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));

	/* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't

	 * enough to allocate the frame buffer memory.

	 */

	init_consistent_dma_size(12 << 20);



	/* setup early devices and console here as well */

	sh7372_add_early_devices();