2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
linux-next/arch/mips/sgi-ip27
Linus Torvalds aebb2afd54 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:

 o Add basic support for the Mediatek/Ralink Wireless SoC family.

 o The Qualcomm Atheros platform is extended by support for the new
   QCA955X SoC series as well as a bunch of patches that get the code
   ready for OF support.

 o Lantiq and BCM47XX platform have a few improvements and bug fixes.

 o MIPS has sent a few patches that get the kernel ready for the
   upcoming microMIPS support.

 o The rest of the series is made up of small bug fixes and cleanups
   that relate to various parts of the MIPS code.  The biggy in there is
   a whitespace cleanup.  After I was sent another set of whitespace
   cleanup patches I decided it was the time to clean the whitespace
   "issues" for once and and that touches many files below arch/mips/.

Fix up silly conflicts, mostly due to whitespace cleanups.

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
  MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
  MIPS: remove broken conditional inside vpe loader code
  MIPS: SMTC: fix implicit declaration of set_vi_handler
  MIPS: early_printk: drop __init annotations
  MIPS: Probe for and report hardware virtualization support.
  MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
  MIPS: ath79: add USB controller registration code for the QCA955X SoCs
  MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
  MIPS: ath79: add WMAC registration code for the QCA955X SoCs
  MIPS: ath79: register UART for the QCA955X SoCs
  MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
  MIPS: ath79: add GPIO setup code for the QCA955X SoCs
  MIPS: ath79: add IRQ handling code for the QCA955X SoCs
  MIPS: ath79: add clock setup code for the QCA955X SoCs
  MIPS: ath79: add SoC detection code for the QCA955X SoCs
  MIPS: ath79: add early printk support for the QCA955X SoCs
  MIPS: ath79: fix WMAC IRQ resource assignment
  mips: reserve elfcorehdr
  mips: Make sure kernel memory is in iomem
  MIPS: ath79: use dynamically allocated USB platform devices
  ...
2013-03-02 07:44:16 -08:00
..
ip27-berr.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-console.c MIPS: early_printk: drop __init annotations 2013-02-19 09:36:37 +01:00
ip27-hubio.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-init.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-irq.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-klconfig.c MIPS: IP27: klconfig.c checkpatch cleanup 2010-08-05 13:25:44 +01:00
ip27-klnuma.c MIPS: IP27: Fix GCC 4.6.0 build error. 2011-05-10 18:15:25 +01:00
ip27-memory.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-nmi.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-reset.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-smp.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-timer.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ip27-xtalk.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
Kconfig arch/mips/sgi-ip27: remove depends on CONFIG_EXPERIMENTAL 2013-01-21 14:43:12 -08:00
Makefile MIPS: IP27: Migrate to new Platform file 2010-08-05 13:25:47 +01:00
Platform MIPS: IP27: Migrate to new Platform file 2010-08-05 13:25:47 +01:00
TODO Fix common misspellings 2011-03-31 11:26:23 -03:00