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

Commit 0b6de009 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/apic' into perfcounters/core 

Conflicts:
	arch/x86/kernel/cpu/perfctr-watchdog.c
parents 37a25424 f62bae50

Documentation/connector/cn_test.c

+2 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void cn_test_timer_func(unsigned long __data) 


		memcpy(m + 1, data, m->len);



		cn_netlink_send(m, 0, gfp_any());

		cn_netlink_send(m, 0, GFP_ATOMIC);

		kfree(m);

	}
@@ -160,10 +160,8 @@ static int cn_test_init(void) 
		goto err_out;

	}



	init_timer(&cn_test_timer);

	cn_test_timer.function = cn_test_timer_func;

	setup_timer(&cn_test_timer, cn_test_timer_func, 0);

	cn_test_timer.expires = jiffies + HZ;

	cn_test_timer.data = 0;

	add_timer(&cn_test_timer);



	return 0;

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

arch/alpha/include/asm/statfs.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _ALPHA_STATFS_H

#define _ALPHA_STATFS_H



#include <linux/types.h>



/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't

   even seem to implement statfs64 */

#define __statfs_word __u32

arch/alpha/include/asm/swab.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ALPHA_SWAB_H

#define _ALPHA_SWAB_H



#include <asm/types.h>

#include <linux/types.h>

#include <linux/compiler.h>

#include <asm/compiler.h>

arch/arm/include/asm/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __ARM_A_OUT_H__



#include <linux/personality.h>

#include <asm/types.h>

#include <linux/types.h>



struct exec

{