Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9a443cd authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'irq/for-xen' into irq/core 



irq/for-xen contains new functionality to avoid Xen private irq
hackery. That branch has a single irq commit and is pulled by Xen to
base their new features on.

Merge it into irq/core as other patches modify the same code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 285c1a2c dc5f219e

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ Conexant 5066 
=============

  laptop	Basic Laptop config (default)

  hp-laptop	HP laptops, e g G60

  asus		Asus K52JU, Lenovo G560

  dell-laptop	Dell laptops

  dell-vostro	Dell Vostro

  olpc-xo-1_5	OLPC XO 1.5

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 38

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/arm/mach-ep93xx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ EXPORT_SYMBOL(ep93xx_i2s_release); 
static struct resource ep93xx_ac97_resources[] = {

	{

		.start	= EP93XX_AAC_PHYS_BASE,

		.end	= EP93XX_AAC_PHYS_BASE + 0xb0 - 1,

		.end	= EP93XX_AAC_PHYS_BASE + 0xac - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

arch/arm/mach-imx/mach-mx25_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static const uint32_t mx25pdk_keymap[] = { 
	KEY(3, 3, KEY_POWER),

};



static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = {

static const struct matrix_keymap_data mx25pdk_keymap_data __initconst = {

	.keymap		= mx25pdk_keymap,

	.keymap_size	= ARRAY_SIZE(mx25pdk_keymap),

};

arch/arm/mach-ixp4xx/common.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static struct clocksource clocksource_ixp4xx = { 
	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



unsigned long ixp4xx_timer_freq = FREQ;

unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;

EXPORT_SYMBOL(ixp4xx_timer_freq);

static void __init ixp4xx_clocksource_init(void)

{
@@ -496,7 +496,7 @@ static struct clock_event_device clockevent_ixp4xx = { 


static void __init ixp4xx_clockevent_init(void)

{

	clockevent_ixp4xx.mult = div_sc(FREQ, NSEC_PER_SEC,

	clockevent_ixp4xx.mult = div_sc(IXP4XX_TIMER_FREQ, NSEC_PER_SEC,

					clockevent_ixp4xx.shift);

	clockevent_ixp4xx.max_delta_ns =

		clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx);