mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-12 08:45:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
2a43ca0aa9084c41aaa1006fbf22155b2e94babf
linux/drivers
History
David S. Miller 2a43ca0aa9 mv643xx_eth: Properly resolve merge conflict. 
The second SET_NETDEV_DEV() in the hunk should be
removed.

Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-10-31 10:33:08 -04:00
..
accessibility
…
acpi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
amba
…
android
ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
2016-10-24 19:37:48 +02:00
ata
ahci: fix the single MSI-X case in ahci_init_one
2016-10-25 11:43:07 -04:00
atm
…
auxdisplay
auxdisplay: img-ascii-lcd: driver for simple ASCII LCD displays
2016-10-06 17:03:41 +02:00
base
driver core: Make Kconfig text for DEBUG_TEST_DRIVER_REMOVE stronger
2016-10-27 17:47:12 +02:00
bcma
…
block
block: DAC960: print a hex number after a 0x prefix
2016-10-27 18:43:43 -07:00
bluetooth
Bluetooth: btwilink: Fix probe return value
2016-10-20 10:14:49 +02:00
bus
bus: qcom-ebi2: depend on ARCH_QCOM or COMPILE_TEST
2016-10-17 13:46:09 -07:00
cdrom
…
char
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
clk
clk: at91: Fix a return value in case of error
2016-10-20 16:37:56 -07:00
clocksource
Revert "clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init"
2016-10-20 21:58:58 +02:00
connector
…
cpufreq
Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'
2016-10-29 01:29:17 +02:00
cpuidle
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-10-10 14:04:16 -07:00
dax
device-dax: fix percpu_ref_exit ordering
2016-10-27 17:04:05 -07:00
dca
…
devfreq
PM / devfreq: Skip status update on uninitialized previous_freq
2016-10-11 00:01:20 +02:00
dio
…
dma
Merge tag 'dmaengine-4.9-rc1' of git://git.infradead.org/users/vkoul/slave-dma
2016-10-06 17:13:54 -07:00
dma-buf
Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux
2016-10-11 18:12:22 -07:00
edac
Merge tag 'edac_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2016-10-04 12:06:26 -07:00
eisa
…
extcon
extcon: qcom-spmi-misc: Sync the extcon state on interrupt
2016-10-26 16:04:29 +09:00
firewire
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
firmware
efi/arm: Fix absolute relocation detection for older toolchains
2016-10-19 14:49:44 +02:00
fmc
…
fpga
…
gpio
gpio: mpc8xxx: Correct irq handler function
2016-10-24 02:20:40 +02:00
gpu
drm/drivers: add support for using the arch wc mapping API.
2016-10-26 16:48:01 +10:00
hid
HID: add quirk for Akai MIDImix.
2016-10-10 10:58:22 +02:00
hsi
net: use core MTU range checking in misc drivers
2016-10-20 14:51:10 -04:00
hv
hv: do not lose pending heartbeat vmbus packets
2016-10-25 08:52:10 +02:00
hwmon
hwmon: (max31790) potential ERR_PTR dereference
2016-10-17 10:16:20 -07:00
hwspinlock
…
hwtracing
…
i2c
i2c: imx: defer probe if bus recovery GPIOs are not ready
2016-10-25 12:15:00 +02:00
ide
…
idle
nmi_backtrace: generate one-line reports for idle cpus
2016-10-07 18:46:30 -07:00
iio
Merge tag 'iio-fixes-for-4.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
2016-10-24 10:50:13 +02:00
infiniband
Merge tag 'shared-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma
2016-10-30 17:31:12 -04:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-10-14 13:19:30 -07:00
iommu
Merge tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2016-10-11 12:52:41 -07:00
ipack
ipack: print a hex number after a 0x prefix
2016-10-27 18:43:43 -07:00
irqchip
Merge tag 'gic-fixes-for-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
2016-10-21 21:40:29 +02:00
isdn
net: deprecate eth_change_mtu, remove usage
2016-10-13 09:36:57 -04:00
leds
…
lguest
…
lightnvm
Merge branch 'for-4.9/block' of git://git.kernel.dk/linux-block
2016-10-07 14:42:05 -07:00
macintosh
…
mailbox
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2016-10-06 17:36:53 -07:00
mcb
mcb: Add a dma_device to mcb_device
2016-09-27 12:33:47 +02:00
md
Merge tag 'dm-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2016-10-28 09:27:58 -07:00
media
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
memory
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
memstick
memstick: rtsx_usb_ms: Manage runtime PM when accessing the device
2016-10-17 15:43:05 +02:00
message
net: use core MTU range checking in misc drivers
2016-10-20 14:51:10 -04:00
mfd
Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2016-10-07 08:35:35 -07:00
misc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
mmc
mmc: rtsx_usb_sdmmc: Handle runtime PM while changing the led
2016-10-17 15:43:03 +02:00
mtd
ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()
2016-10-28 14:48:18 +02:00
net
mv643xx_eth: Properly resolve merge conflict.
2016-10-31 10:33:08 -04:00
nfc
…
ntb
…
nubus
…
nvdimm
nvdimm: make CONFIG_NVDIMM_DAX 'bool'
2016-10-27 16:16:21 -07:00
nvme
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2016-10-21 10:54:01 -07:00
nvmem
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2016-10-07 21:23:40 -07:00
of
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-10-15 09:26:12 -07:00
oprofile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 20:16:43 -07:00
parisc
…
parport
…
pci
doc: Add missing parameter for msi_setup
2016-10-26 12:05:34 +02:00
pcmcia
…
perf
perf: xgene: Remove bogus IS_ERR() check
2016-10-17 15:50:07 +01:00
phy
…
pinctrl
pinctrl: intel: Only restore pins that are used by the driver
2016-10-18 14:38:16 +02:00
platform
Merge tag 'platform-drivers-x86-v4.9-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2016-10-19 11:45:06 -07:00
pnp
…
power
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2016-10-06 18:21:15 -07:00
powercap
…
pps
pps: kc: fix non-tickless system config dependency
2016-10-11 15:06:32 -07:00
ps3
…
ptp
drivers/ptp: Fix kernel memory disclosure
2016-10-13 10:20:06 -04:00
pwm
…
rapidio
mm: replace get_user_pages() write/force parameters with gup_flags
2016-10-19 08:11:43 -07:00
ras
…
regulator
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2016-10-12 11:05:23 -07:00
remoteproc
Merge tag 'rpmsg-v4.9' of git://github.com/andersson/remoteproc
2016-10-06 17:03:49 -07:00
reset
reset: uniphier: rename MIO reset to SD reset for Pro5, PXs2, LD20 SoCs
2016-10-22 18:31:42 +09:00
rpmsg
…
rtc
Merge tag 'rtc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2016-10-14 13:13:44 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
sfi
…
sh
…
sn
…
soc
Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2016-10-14 11:07:42 -07:00
spi
kthread: kthread worker API cleanup
2016-10-11 15:06:33 -07:00
spmi
spmi: pmic-arb: Return an error code if sanity check fails
2016-09-27 12:43:34 +02:00
ssb
…
staging
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
target
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
tc
…
thermal
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
thunderbolt
…
tty
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
uio
…
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
uwb
…
vfio
vfio_pci: use pci_alloc_irq_vectors
2016-09-29 13:36:38 -06:00
vhost
…
video
Merge branch 'gup_flag-cleanups'
2016-10-19 08:39:47 -07:00
virt
mm: replace get_user_pages() write/force parameters with gup_flags
2016-10-19 08:11:43 -07:00
virtio
…
vlynq
…
vme
vme: vme_get_size potentially returning incorrect value on failure
2016-10-28 08:25:18 -04:00
w1
…
watchdog
Merge branches 'acpi-wdat' and 'acpi-cppc'
2016-10-21 22:24:23 +02:00
xen
Merge tag 'for-linus-4.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2016-10-24 19:52:24 -07:00
zorro
…
Kconfig
…
Makefile
Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
2016-10-23 15:56:23 -07:00