leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77e26cca20
linux/arch/mips
History
Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa 
Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-06-01 21:06:21 +02:00
..
alchemy MIPS: Alchemy: Timer build fix 2009-05-14 13:50:27 +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
cavium-octeon Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
cobalt cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
configs MIPS: Mark Eins: Fix configuration. 2009-03-13 23:08:00 +01: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 Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
jazz Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
kernel Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02: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: Cavium: Add support for 8k and 32k page sizes. 2009-05-14 13:50:27 +01:00
math-emu MIPS: Switch FPU emulator trap to BREAK instruction. 2008-10-30 14:44:34 +00:00
mipssim
mm MIPS: 64-bit: Fix system lockup. 2009-05-20 18:53:14 +01:00
mti-malta irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02: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: RC32434: Define io_map_base for PCI controller 2009-01-30 21:32:59 +00:00
pmc-sierra MIPS: MSP71xx: Remove the RAMROOT functions 2009-05-14 13:50:29 +01:00
rb532 Input: add driver for S1 button of rb532 2009-03-09 20:10:12 -07:00
sgi-ip22 MIPS: IP22: Fix hang in power button interrupt handler 2009-05-20 18:53:13 +01:00
sgi-ip27 clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
sgi-ip32 MIPS: IP32: Remove unnecessary if not even harmful volatile keywords. 2009-05-22 13:52:06 +01:00
sibyte Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
sni Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
txx9 MIPS: TXx9: Fix possible overflow in clock calculations 2009-05-14 13:50:27 +01:00
vr41xx cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
Kconfig MIPS: Kconfig: Delete duplicate definition of RWSEM_GENERIC_SPINLOCK. 2009-05-14 13:50:27 +01:00
Kconfig.debug MIPS: Kconfig: Fix the arch-specific header path 2008-12-12 18:12:23 +00:00
Makefile MIPS: IP28: Change to build with -mr10k-cache-barrier=store 2009-05-20 18:53:13 +01:00