Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
d8d4e3ae0b
linux/arch/mips/include/asm/mach-au1x00
History
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
..
au1xxx_dbdma.h MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines 2011-10-24 23:34:24 +01:00
au1xxx_eth.h MIPS: au1000_eth: Get ethernet address from platform_data 2010-08-05 13:26:09 +01:00
au1xxx_ide.h MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep 2011-10-24 23:34:24 +01:00
au1xxx_psc.h Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
au1000_dma.h MIPS: Alchemy: Cleanup DMA addresses 2011-05-19 09:55:46 +01:00
au1000.h MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines 2011-10-24 23:34:24 +01:00
au1100_mmc.h MMC: AU1xMMC: Allow platforms to disable host capabilities 2010-02-27 12:53:19 +01:00
au1550_spi.h
cpu-feature-overrides.h MIPS: Alchemy: provide cpu feature overrides. 2009-03-30 14:49:46 +02:00
gpio-au1000.h MIPS: Alchemy: support multiple GPIO styles in one kernel 2011-10-24 23:34:23 +01:00
gpio.h MIPS: Alchemy: support multiple GPIO styles in one kernel 2011-10-24 23:34:23 +01:00
ioremap.h MIPS: Alchemy: use 36bit addresses for PCMCIA resources. 2010-02-27 12:53:43 +01:00
prom.h MIPS: Alchemy: Remove prom_getcmdline() 2010-02-27 12:53:21 +01:00
war.h