q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/arch/mips/pmc-sierra/msp71xx
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
..
Makefile MIPS: MSP71xx: Platform support for On-chip MSP ethernet devices. 2011-03-25 18:45:14 +01:00
gpio.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
gpio_extended.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
msp_elb.c
…
msp_eth.c MIPS: MSP71xx: Platform support for On-chip MSP ethernet devices. 2011-03-25 18:45:14 +01:00
msp_hwbutton.c MIPS: PNX Removing dead CONFIG_PMCTWILED 2010-08-05 13:26:00 +01:00
msp_irq.c MIPS: MSP71xx: Fix build error. 2011-09-21 17:52:44 +02:00
msp_irq_cic.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
msp_irq_per.c MIPS: MSP71xx: Fix typo in msp_per_irq_controller 2011-05-10 18:15:23 +01:00
msp_irq_slp.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
msp_pci.c [MIPS] PMC MSP71xx PCI support 2007-07-10 17:33:03 +01:00
msp_prom.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
msp_serial.c mips: msp71xx/serial: add workaround for DW UART 2011-08-23 10:53:00 -07:00
msp_setup.c MIPS: MSP71xx: Fix build error. 2011-10-20 15:00:19 +01:00
msp_smp.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
msp_smtc.c MIPS: MSP71xx: Add VSMP/SMTC support. 2011-03-25 18:45:14 +01:00
msp_time.c MIPS: MSP71xx: Set up MSP VPE1 timer. 2011-03-25 18:45:13 +01:00
msp_usb.c MIPS: MSP71xx: Platform support for MSP on-chip USB controller. 2011-03-25 18:45:14 +01:00