This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
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 |
| .. |
|
7990.c
|
…
|
|
|
7990.h
|
…
|
|
|
Kconfig
|
…
|
|
|
Makefile
|
…
|
|
|
a2065.c
|
…
|
|
|
a2065.h
|
…
|
|
|
am79c961a.c
|
…
|
|
|
am79c961a.h
|
…
|
|
|
amd8111e.c
|
…
|
|
|
amd8111e.h
|
…
|
|
|
ariadne.c
|
…
|
|
|
ariadne.h
|
…
|
|
|
atarilance.c
|
…
|
|
|
au1000_eth.c
|
…
|
|
|
au1000_eth.h
|
…
|
|
|
declance.c
|
…
|
|
|
depca.c
|
…
|
|
|
depca.h
|
…
|
|
|
hplance.c
|
…
|
|
|
hplance.h
|
…
|
|
|
lance.c
|
…
|
|
|
mvme147.c
|
…
|
|
|
ni65.c
|
…
|
|
|
ni65.h
|
…
|
|
|
nmclan_cs.c
|
…
|
|
|
pcnet32.c
|
…
|
|
|
sun3lance.c
|
…
|
|
|
sunlance.c
|
…
|
|