Tejun Heo c43768cbb7 Merge branch 'master' into for-next ...

Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes.  As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.

Conflicts:
	arch/alpha/include/asm/percpu.h
	arch/mn10300/kernel/vmlinux.lds.S
	include/linux/percpu-defs.h

2009-07-04 07:13:18 +09:00

..

alchemy

MIPS: Alchemy: devboards: Convert to gpio calls.

2009-06-17 11:06:29 +01:00

basler/excite

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

bcm47xx

MIPS: WGT634U: Add reset button support

2008-10-15 12:46:51 +01:00

boot

[MIPS] checkfiles: Fix "need space after that ','" errors.

2007-10-11 23:46:15 +01:00

cavium-octeon

MIPS: Cavium: Add CPU hotplugging code.

2009-06-24 18:34:40 +01:00

cobalt

cpumask: remove references to struct irqaction's mask field.

2009-03-30 22:05:14 +10:30

configs

i2c/chips: Move max6875 to drivers/misc/eeprom

2009-06-15 18:01:49 +02:00

dec

mips: use bcd2bin/bin2bcd

2008-10-20 08:52:41 -07:00

emma

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

2009-03-30 18:00:26 -07:00

fw

[MIPS] Remove mips_machtype from ARC based machines

2008-07-15 18:44:38 +01:00

gt64120/wrppmc

[MIPS] remove wrppmc_machine_power_off()

2008-07-15 18:44:36 +01:00

include/asm

MIPS: Cavium: Add CPU hotplugging code.

2009-06-24 18:34:40 +01:00

jazz

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

kernel

Merge branch 'master' into for-next

2009-07-04 07:13:18 +09:00

lasat

cpumask: remove references to struct irqaction's mask field.

2009-03-30 22:05:14 +10:30

lemote/lm2e

cpumask: remove references to struct irqaction's mask field.

2009-03-30 22:05:14 +10:30

lib

MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel

2009-06-17 11:06:24 +01:00

math-emu

MIPS: Switch FPU emulator trap to BREAK instruction.

2008-10-30 14:44:34 +00:00

mipssim

MIPS: MIPSsim: Fix build error if MSC01E_INT_BASE is undefined.

2009-06-24 18:34:39 +01:00

mm

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

mti-malta

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

nxp

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

oprofile

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02:00

pci

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

pmc-sierra

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

power

MIPS: Hibernation: Remove SMP TLB and cacheflushing code.

2009-06-24 18:34:39 +01:00

rb532

MIPS: RB532: Check irq number when handling GPIO interrupts

2009-06-17 11:06:27 +01:00

sgi-ip22

MIPS: IP22: Fix hang in power button interrupt handler

2009-05-20 18:53:13 +01:00

sgi-ip27

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

sgi-ip32

MIPS: IP32: Remove unnecessary if not even harmful volatile keywords.

2009-05-22 13:52:06 +01:00

sibyte

MIPS: Sibyte: Fix build error if CONFIG_SERIAL_SB1250_DUART is undefined.

2009-06-24 18:34:39 +01:00

sni

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

txx9

MIPS: TXx9: Add TX4939 RNG support

2009-06-17 11:06:27 +01:00

vr41xx

cpumask: remove references to struct irqaction's mask field.

2009-03-30 22:05:14 +10:30

Kconfig

MIPS: Cavium: Add CPU hotplugging code.

2009-06-24 18:34:40 +01:00

Kconfig.debug

MIPS: Kconfig: Fix the arch-specific header path

2008-12-12 18:12:23 +00:00

Makefile

MIPS: Add hibernation support

2009-06-17 11:06:31 +01:00