AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-03 00:06:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
a18f22a968
linux_dsm_epyc7002/arch/mips
History
Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 
Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2011-05-14 12:06:36 +02:00
..
alchemy Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
ar7 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
ath79 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
bcm47xx MIPS: BCM47xx: Swap serial console if ttyS1 was specified. 2010-12-16 18:11:00 +00:00
bcm63xx MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
boot Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 2010-10-18 13:10:36 -07:00
cavium-octeon Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
cobalt MIPS: Move Cobalt Makefile parts to their own Platform file 2010-08-05 13:25:47 +01:00
configs kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
dec MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
emma MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
fw Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
jazz MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
jz4740 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
kernel Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
lasat MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
lib Fix common misspellings 2011-03-31 11:26:23 -03:00
loongson Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
math-emu Fix common misspellings 2011-03-31 11:26:23 -03:00
mipssim MIPS: SMTC: Move declaration of smtc_init_secondary to <asm/smtc.h>. 2011-03-25 18:45:13 +01:00
mm Fix common misspellings 2011-03-31 11:26:23 -03:00
mti-malta Fix common misspellings 2011-03-31 11:26:23 -03:00
nxp/pnx8550/common MIPS: PNX8550: Move code one directory level up. 2010-08-05 13:25:56 +01:00
oprofile mips: change to new flag variable 2011-03-17 14:02:56 +01:00
pci Fix common misspellings 2011-03-31 11:26:23 -03:00
pmc-sierra Fix common misspellings 2011-03-31 11:26:23 -03:00
pnx833x Fix common misspellings 2011-03-31 11:26:23 -03:00
pnx8550 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
power MIPS: Loongson: Change the Email address of Wu Zhangjin 2010-02-27 12:53:12 +01:00
powertv MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
rb532 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
sgi-ip22 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
sgi-ip27 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
sgi-ip32 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
sibyte MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
sni MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
txx9 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
vr41xx mips: vr41xx: Use irdq_irq_disabled() 2011-03-29 14:48:07 +02:00
wrppmc MIPS: WRPPMC: Migrate to new platform makefile style. 2010-08-05 13:25:51 +01:00
Kbuild MIPS: Repair Kbuild make clean breakage. 2010-10-19 18:32:39 +01:00
Kbuild.platforms MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs 2011-01-18 19:30:24 +01:00
Kconfig clocksource: convert mips to generic i8253 clocksource 2011-05-14 10:29:48 +01:00
Kconfig.debug kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
Makefile Fix common misspellings 2011-03-31 11:26:23 -03:00