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

Commit 9dd056e9 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/stable-updates' into sh-latest

parents 08ef2e42 f2b97261

Documentation/filesystems/proc.txt

+1 −0
Original line number Diff line number Diff line
@@ -843,6 +843,7 @@ Provides counts of softirq handlers serviced since boot time, for each cpu. 
 TASKLET:          0          0          0        290

   SCHED:      27035      26983      26971      26746

 HRTIMER:          0          0          0          0

     RCU:       1678       1769       2178       2250





1.3 IDE devices in /proc/ide

MAINTAINERS

+9 −3
Original line number Diff line number Diff line
@@ -2291,8 +2291,7 @@ F: drivers/scsi/eata_pio.* 


EBTABLES

M:	Bart De Schuymer <bart.de.schuymer@pandora.be>

L:	ebtables-user@lists.sourceforge.net

L:	ebtables-devel@lists.sourceforge.net

L:	netfilter-devel@vger.kernel.org

W:	http://ebtables.sourceforge.net/

S:	Maintained

F:	include/linux/netfilter_bridge/ebt_*.h
@@ -6463,7 +6462,7 @@ M: Jiri Kosina <jkosina@suse.cz> 
L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git

S:	Maintained

F:	Documentation/usb/hiddev.txt

F:	Documentation/hid/hiddev.txt

F:	drivers/hid/usbhid/



USB ISP116X DRIVER
@@ -7007,6 +7006,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86. 
S:	Maintained

F:	drivers/platform/x86



X86 MCE INFRASTRUCTURE

M:	Tony Luck <tony.luck@intel.com>

M:	Borislav Petkov <bp@amd64.org>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	arch/x86/kernel/cpu/mcheck/*



XEN HYPERVISOR INTERFACE

M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Makefile

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

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Sneaky Weasel



# *DOCUMENTATION*
@@ -1526,7 +1526,8 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 


# Run depmod only if we have System.map and depmod is executable

quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)

      cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)

      cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \

                   $(KERNELRELEASE)



# Create temporary dir for module support files

# clean it up only when building all modules

arch/arm/mach-msm/timer.c

+11 −3
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/io.h>



#include <asm/mach/time.h>

#include <asm/hardware/gic.h>



#include <mach/msm_iomap.h>

#include <mach/cpu.h>
@@ -55,10 +57,12 @@ enum timer_location { 
#if defined(CONFIG_ARCH_QSD8X50)

#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */

#define MSM_DGT_SHIFT (0)

#elif defined(CONFIG_ARCH_MSM7X30) || defined(CONFIG_ARCH_MSM8X60) || \

				      defined(CONFIG_ARCH_MSM8960)

#elif defined(CONFIG_ARCH_MSM7X30)

#define DGT_HZ (24576000 / 4) /* 24.576 MHz (LPXO) / 4 by default */

#define MSM_DGT_SHIFT (0)

#elif defined(CONFIG_ARCH_MSM8X60) || defined(CONFIG_ARCH_MSM8960)

#define DGT_HZ (27000000 / 4) /* 27 MHz (PXO) / 4 by default */

#define MSM_DGT_SHIFT (0)

#else

#define DGT_HZ 19200000 /* 19.2 MHz or 600 KHz after shift */

#define MSM_DGT_SHIFT (5)
@@ -100,7 +104,11 @@ static cycle_t msm_read_timer_count(struct clocksource *cs) 
{

	struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);



	return readl(clk->global_counter);

	/*

	 * Shift timer count down by a constant due to unreliable lower bits

	 * on some targets.

	 */

	return readl(clk->global_counter) >> clk->shift;

}



static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)

arch/arm/mach-omap1/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 


# Common support

obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o



obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o

obj-$(CONFIG_PM) += pm.o sleep.o



# DSP

obj-$(CONFIG_OMAP_MBOX_FWK)	+= mailbox_mach.o