Linus Torvalds d6748066ad Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits) MIPS: O32: Provide definition of registers ta0 .. ta3. MIPS: perf: Add Octeon support for hardware perf. MIPS: perf: Add support for 64-bit perf counters. MIPS: perf: Reorganize contents of perf support files. MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c MIPS: Add accessor macros for 64-bit performance counter registers. MIPS: Add probes for more Octeon II CPUs. MIPS: Add more CPU identifiers for Octeon II CPUs. MIPS: XLR, XLS: Add comment for smp setup MIPS: JZ4740: GPIO: Check correct IRQ in demux handler MIPS: JZ4740: GPIO: Simplify IRQ demuxer MIPS: JZ4740: Use generic irq chip MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines MIPS: Alchemy: kill au1xxx.h header MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep MIPS: Alchemy: Redo PCI as platform driver MIPS: Alchemy: more base address cleanup MIPS: Alchemy: rewrite USB platform setup. MIPS: Alchemy: abstract USB block control register access ... Fix up trivial conflicts in: arch/mips/alchemy/devboards/db1x00/platform.c drivers/ide/Kconfig drivers/mmc/host/au1xmmc.c drivers/video/Kconfig sound/mips/Kconfig		2011-11-03 13:28:14 -07:00
..
dec
emma
fw
ip32
lasat	doc: fix broken references	2011-09-27 18:08:04 +02:00
mach-ar7
mach-ath79
mach-au1x00	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
mach-bcm47xx	bcm47xx: add support for bcma bus	2011-08-08 14:29:32 -04:00
mach-bcm63xx
mach-cavium-octeon	MIPS: Octeon: Enable C0_UserLocal probing.	2011-09-24 01:44:41 +02:00
mach-cobalt
mach-db1x00	MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines	2011-10-24 23:34:24 +01:00
mach-dec
mach-emma2rh
mach-generic
mach-ip22
mach-ip27
mach-ip28
mach-ip32
mach-jazz
mach-jz4740
mach-lantiq
mach-lasat
mach-loongson
mach-malta
mach-mipssim
mach-netlogic
mach-pb1x00	MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines	2011-10-24 23:34:24 +01:00
mach-pnx833x
mach-pnx8550
mach-powertv	MIPS: Remove unneeded version.h includes from arch/mips/	2011-09-17 02:40:36 +02:00
mach-rc32434
mach-rm
mach-sibyte
mach-tx39xx
mach-tx49xx
mach-vr41xx
mach-wrppmc
mach-yosemite
mips-boards
netlogic
octeon
pci
pmc-sierra/msp71xx
sgi
sibyte
sn
txx9
vr41xx
xtalk
abi.h
addrspace.h
amon.h
arch_hweight.h
asm-offsets.h
asm.h
asmmacro-32.h
asmmacro-64.h
asmmacro.h
atomic.h	atomic: cleanup asm-generic atomic*.h inclusion	2011-07-26 16:49:47 -07:00
auxvec.h
barrier.h
bcache.h
bitops.h
bitsperlong.h
bootinfo.h
branch.h
break.h
bug.h
bugs.h
byteorder.h
cache.h
cachectl.h
cacheflush.h	MIPS: cache: Provide cache flush operations for XFS	2011-10-20 15:00:18 +01:00
cacheops.h
cevt-r4k.h
checksum.h
clock.h
cmp.h
cmpxchg.h
compat-signal.h
compat.h	compat: sync compat_stats with statfs.	2011-10-28 14:58:53 +02:00
compiler.h
cop2.h
cpu-features.h
cpu-info.h
cpu.h	MIPS: Add more CPU identifiers for Octeon II CPUs.	2011-10-24 23:34:25 +01:00
cputime.h
current.h
debug.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
ds1287.h
dsp.h
edac.h
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap.h
floppy.h
fpregdef.h
fpu_emulator.h
fpu.h
ftrace.h
futex.h
gcmpregs.h
gic.h
gpio.h
gt64120.h
hardirq.h
hazards.h
highmem.h
hugetlb.h
hw_irq.h
i8259.h
ide.h
inst.h
io.h	Revert "MIPS: LD/SD o32 macro GAS fix update"	2011-10-20 15:00:19 +01:00
ioctl.h
ioctls.h
ipcbuf.h
irq_cpu.h
irq_gt641xx.h
irq_regs.h
irq.h
irqflags.h
isadep.h
jazz.h
jazzdma.h
jump_label.h
Kbuild
kdebug.h
kexec.h
kgdb.h
kmap_types.h
kprobes.h
kspd.h
linkage.h
local64.h
local.h
m48t37.h
mc146818-time.h
mc146818rtc.h
mips_machine.h
mips_mt.h
mipsmtregs.h
mipsprom.h	MIPS: SNI: Fix conflicting wrapper symbols for headers.	2011-10-20 15:00:18 +01:00
mipsregs.h	MIPS: Add accessor macros for 64-bit performance counter registers.	2011-10-24 23:34:26 +01:00
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
msc01_ic.h
msgbuf.h
mutex.h
nile4.h
paccess.h
page.h
param.h
parport.h
pci.h
percpu.h
perf_event.h
pgalloc.h
pgtable-32.h
pgtable-64.h
pgtable-bits.h
pgtable.h
pmon.h
poll.h
posix_types.h
prefetch.h
processor.h
prom.h	MIPS: SNI: Fix conflicting wrapper symbols for headers.	2011-10-20 15:00:18 +01:00
ptrace.h
r4k-timer.h
r4kcache.h
reboot.h
reg.h
regdef.h	MIPS: O32: Provide definition of registers ta0 .. ta3.	2011-10-24 23:34:27 +01:00
resource.h
rm9k-ocd.h
rtlx.h
scatterlist.h
seccomp.h
sections.h
segment.h
sembuf.h
serial.h
setup.h
sgialib.h
sgiarcs.h
sgidefs.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sim.h
smp-ops.h
smp.h
smtc_ipi.h
smtc_proc.h
smtc.h
smvp.h
sni.h
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h
spram.h
stackframe.h	MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC	2011-09-21 17:54:02 +02:00
stacktrace.h
stat.h
statfs.h
string.h
suspend.h
swab.h
sysmips.h
system.h
termbits.h
termios.h
thread_info.h
time.h
timex.h
titan_dep.h
tlb.h
tlbdebug.h
tlbflush.h
topology.h
traps.h
txx9irq.h
txx9pio.h
txx9tmr.h
types.h
uaccess.h
uasm.h
ucontext.h
unaligned.h
unistd.h
user.h
vdso.h
vga.h
vpe.h
war.h
watch.h
wbflush.h
xor.h