WSL2-Linux-Kernel/arch/mips
David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
2009-03-05 02:06:47 -08:00
..
alchemy MIPS: Alchemy: In plat_time_init() t reaches -1, tested: 0 2009-02-27 17:56:34 +00:00
basler/excite [MIPS] kgdb: Remove existing implementation 2008-07-30 21:54:42 +01: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: Octeon: Remove duplicated #includes 2009-01-30 21:32:57 +00:00
cobalt [MIPS] Cobalt: Fix I/O port resource range 2008-07-20 14:38:20 +01:00
configs MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT 2009-01-30 21:32:58 +00:00
dec mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
emma MIPS: Markeins: Remove unnecessary define and cleanup comments, etc. 2008-10-27 16:18:31 +00: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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-03-05 02:06:47 -08:00
jazz cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
kernel Revert "MIPS: Print irq handler description" 2009-02-27 17:56:35 +00:00
lasat sysctl: simplify ->strategy 2008-10-16 11:21:47 -07:00
lemote/lm2e MIPS: lemote/lm2e: Added io_map_base to pci controller 2008-10-27 16:18:31 +00:00
lib MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT 2009-01-30 21:32:58 +00:00
math-emu MIPS: Switch FPU emulator trap to BREAK instruction. 2008-10-30 14:44:34 +00:00
mipssim [MIPS] Remove TLB sanitation code 2008-04-28 17:14:25 +01:00
mm MIPS: CVE-2009-0029: Enable syscall wrappers. 2009-02-27 17:56:35 +00:00
mti-malta cpumask: make irq_set_affinity() take a const struct cpumask 2008-12-13 21:20:26 +10:30
nxp cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
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 trivial: fix then -> than typos in comments and documentation 2009-01-06 11:28:06 +01:00
rb532 MIPS: RB532: Export rb532_gpio_set_func() 2009-01-30 21:33:01 +00:00
sgi-ip22 MIPS: IP22: ip22-int.c header file weeding. 2008-10-27 16:18:28 +00:00
sgi-ip27 cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
sgi-ip32 MIPS: IP32: Add platform device for CMOS RTC; remove dead code 2008-10-15 12:46:52 +01:00
sibyte cpumask: make irq_set_affinity() take a const struct cpumask 2008-12-13 21:20:26 +10:30
sni cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
txx9 MIPS: TXx9: Add support for TX4939 internal RTC 2009-01-30 21:32:58 +00:00
vr41xx [MIPS] VR41xx: unsigned irq cannot be negative 2008-09-16 11:04:30 +02:00
Kconfig MIPS: CVE-2009-0029: Enable syscall wrappers. 2009-02-27 17:56:35 +00:00
Kconfig.debug MIPS: Kconfig: Fix the arch-specific header path 2008-12-12 18:12:23 +00:00
Makefile MIPS: Alchemy: Move development board code to common subdirectory 2009-01-11 09:57:25 +00:00