FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 03:48:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/drivers
History
David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
accessibility
…
acpi
Merge branches 'acpi-init' and 'acpica'
2015-05-15 00:31:23 +02:00
amba
ARM: 8334/1: amba: tegra-ahb: detect and correct bogus base address
2015-04-02 10:03:55 +01:00
android
…
ata
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-05-11 10:54:20 -07:00
atm
atm:he - Change 1 to true for bool type variable.
2015-05-25 16:34:35 -04:00
auxdisplay
…
base
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-04-26 17:22:07 -07:00
bcma
bcma: enable 32 GPIO pins for BCM4707
2015-05-09 16:28:07 +03:00
block
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-23 01:22:35 -04:00
bluetooth
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2015-05-30 23:26:45 -07:00
bus
MIPS: Fix CDMM to use native endian MMIO reads
2015-05-26 16:46:52 +02:00
cdrom
…
char
ipmi: Fix multi-part message handling
2015-05-05 19:37:22 -05:00
clk
clk: qcom: Add support for NSS/GMAC clocks and resets
2015-05-30 17:04:36 -07:00
clocksource
Initial ACPI support for arm64:
2015-04-24 08:23:45 -07:00
connector
…
cpufreq
cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
2015-04-15 23:02:24 +02:00
cpuidle
cpuidle: Run tick_broadcast_exit() with disabled interrupts
2015-04-29 15:19:21 +02:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-04-26 13:51:05 -07:00
dca
…
devfreq
PM / devfreq: tegra: Register governor on module init
2015-03-31 13:17:15 +09:00
dio
…
dma
dmaengine: increment privatecnt when using dma_get_any_slave_channel
2015-04-29 16:47:57 +05:30
dma-buf
dma-buf: cleanup dma_buf_export() to make it easily extensible
2015-04-21 14:47:16 +05:30
edac
…
eisa
…
extcon
extcon: usb-gpio: register extcon device before IRQ registration
2015-04-27 11:06:05 +09:00
firewire
…
firmware
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2015-05-14 18:02:15 -07:00
fmc
…
gpio
gpio: gpio-kempld: Fix get_direction return value
2015-05-12 13:49:13 +02:00
gpu
Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
2015-05-29 11:13:52 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2015-05-21 17:23:11 -07:00
hsi
HSI: cmt_speech: fix error return code
2015-04-05 14:45:27 +02:00
hv
Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
2015-04-03 16:20:12 +02:00
hwmon
hwmon: (nct6683) Add missing sysfs attribute initialization
2015-05-29 17:47:42 -07:00
hwspinlock
…
hwtracing/coresight
Char/Misc driver patches for 4.1-rc1
2015-04-21 09:42:58 -07:00
i2c
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2015-04-26 17:44:09 -07:00
ide
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-05-11 10:54:20 -07:00
idle
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
iio
The usual mixed bag of fixes for IIO in the 4.1 cycle.
2015-05-13 11:51:14 -07:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-05-22 14:49:55 -07:00
iommu
iommu/arm-smmu: Fix sign-extension of upstream bus addresses at stage 1
2015-05-11 18:36:20 +02:00
ipack
…
irqchip
irqchip/gicv3-its: ITS table size should not be smaller than PSZ
2015-05-20 22:13:37 +02:00
isdn
isdn/capi: Use setup_timer
2015-05-31 21:36:37 -07:00
leds
This is the bulk of GPIO changes for the v4.1 development
2015-04-18 08:22:10 -04:00
lguest
lguest: fix out-by-one error in address checking.
2015-05-27 09:57:21 -07:00
macintosh
Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
2015-04-07 13:25:14 +10:00
mailbox
…
mcb
mcb: request_mem_region() returns NULL on error
2015-04-03 16:15:30 +02:00
md
Quite a few fixes for DM's blk-mq support thanks to extra DM multipath
2015-05-29 14:39:24 -07:00
media
media fixes for v4.1-rc3
2015-05-05 08:42:06 -07:00
memory
ARM: SoC driver updates for v4.1
2015-04-22 09:18:17 -07:00
memstick
memstick: mspro_block: add missing curly braces
2015-04-17 09:04:09 -04:00
message
…
mfd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
misc
Char/Misc driver patches for 4.1-rc1
2015-04-21 09:42:58 -07:00
mmc
mmc: atmel-mci: fix bad variable type for clkdiv
2015-05-18 09:04:42 +02:00
mtd
Two MTD fixes for 4.1:
2015-05-18 10:01:54 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
nfc
NFC: logging neatening
2015-04-07 12:05:12 +02:00
ntb
…
nubus
…
of
of: mdio: Add a "broken-turn-around" property
2015-05-14 13:40:55 -04:00
oprofile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-04-26 17:22:07 -07:00
parisc
parisc: %pf is only for function pointers
2015-04-24 13:45:54 +02:00
parport
…
pci
xen: features and fixes for 4.1-rc0
2015-04-16 14:01:03 -05:00
pcmcia
ARM: SoC cleanups for v4.1
2015-04-22 09:04:39 -07:00
phy
USB patches for 4.1-rc1
2015-04-13 17:07:21 -07:00
pinctrl
pinctrl: Fix gpio/pin mapping for Meson8b
2015-05-19 11:40:52 +02:00
platform
thinkpad_acpi: Revert unintentional device attribute renaming
2015-05-20 02:18:12 -07:00
pnp
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
power
power: bq27x00_battery: Add missing MODULE_ALIAS
2015-05-01 23:01:48 +02:00
powercap
powercap / RAPL: Add support for Intel Skylake processors
2015-04-15 23:06:16 +02:00
pps
…
ps3
ps3: Fix trivial typos in comment and debug message
2015-03-26 15:23:17 +11:00
ptp
ptp: remove 32 bit get/set methods.
2015-03-31 12:01:19 -04:00
pwm
pwm: img: Impose upper and lower timebase steps value
2015-05-19 16:07:40 +02:00
rapidio
…
ras
…
regulator
mfd: da9052: Fix broken regulator probe
2015-05-27 13:34:15 +01:00
remoteproc
…
reset
…
rpmsg
…
rtc
drivers/rtc/rtc-armada38x.c: remove unused local `flags'
2015-05-14 17:55:51 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-23 01:22:35 -04:00
sbus
drivers/sbus/char/envctrl.c: ignore orderly_poweroff return value
2015-04-15 16:35:23 -07:00
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
sfi
…
sh
drivers: sh: Remove test for now unsupported sh7372
2015-04-27 13:08:14 +09:00
sn
…
soc
- fix unused variable warning for pmic-wrapper
2015-04-14 00:43:28 +02:00
spi
Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix/fsl-espi' into spi-linus
2015-05-11 17:29:49 +01:00
spmi
spmi: pmic_arb: remove ARM build time dependency
2015-04-03 16:15:30 +02:00
ssb
ssb: extend fix for PCI related silent reboots to all chipsets
2015-05-20 16:36:06 +03:00
staging
As we get closer to the merge window, here are a few
2015-05-31 17:34:26 -07:00
target
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
tc
…
thermal
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into for-rc
2015-05-19 08:12:27 +08:00
thunderbolt
…
tty
ttyFDC: Fix to use native endian MMIO reads
2015-05-26 16:46:52 +02:00
uio
Revert "uio: constify of_device_id array"
2015-04-03 16:04:21 +02:00
usb
USB-serial fixes for v4.1-rc4
2015-05-14 12:43:36 -07:00
uwb
…
vfio
vfio: Fix runaway interruptible timeout
2015-05-01 16:31:41 -06:00
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
video
backlight: pwm: Handle EPROBE_DEFER while requesting the PWM
2015-05-26 08:44:59 +01:00
virt
…
virtio
virtio: drop virtio_device_is_legacy_only
2015-04-15 12:41:14 +09:30
vlynq
…
vme
…
w1
w1: constify of_device_id array
2015-03-25 12:25:29 +01:00
watchdog
Merge git://www.linux-watchdog.org/linux-watchdog
2015-04-22 11:22:55 -07:00
xen
xen/events: don't bind non-percpu VIRQs with percpu chip
2015-05-19 19:55:36 +01:00
zorro
…
Kconfig
…
Makefile
coresight: moving to new "hwtracing" directory
2015-04-03 16:17:04 +02:00