From: Linus Torvalds Date: Tue, 18 Jan 2011 22:28:48 +0000 (-0800) Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: Ubuntu-5.2.0-15.16~22241 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5d7e8af3c5727626b9e7f909c778b9ac9b4a1809;p=mirror_ubuntu-eoan-kernel.git Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits) MIPS: Malta: enable Cirrus FB console MIPS: add CONFIG_VIRTUALIZATION for virtio support MIPS: Implement __read_mostly MIPS: ath79: add common WMAC device for AR913X based boards MIPS: ath79: Add initial support for the Atheros AP81 reference board MIPS: ath79: add common SPI controller device SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs MIPS: ath79: add common GPIO buttons device MIPS: ath79: add common watchdog device MIPS: ath79: add common GPIO LEDs device MIPS: ath79: add initial support for the Atheros PB44 reference board MIPS: ath79: utilize the MIPS multi-machine support MIPS: ath79: add GPIOLIB support MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs MIPS: jump label: Add MIPS support. MIPS: Use WARN() in uasm for better diagnostics. MIPS: Optimize TLB handlers for Octeon CPUs MIPS: Add LDX and LWX instructions to uasm. MIPS: Use BBIT instructions in TLB handlers MIPS: Declare uasm bbit0 and bbit1 functions. ... --- 5d7e8af3c5727626b9e7f909c778b9ac9b4a1809