mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-03 12:24:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
4cdf507d54525842dfd9f6313fdafba039084046
linux/drivers
History
David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00
..
accessibility
…
acpi
Merge tag 'pci-v3.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-09-19 10:50:30 -07:00
amba
…
ata
ahci_xgene: Fix the link down in first attempt for the APM X-Gene SoC AHCI SATA host controller driver.
2014-09-06 11:27:15 +09:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-13 18:27:40 -06:00
auxdisplay
…
base
Merge tag 'regmap-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
2014-09-15 16:20:56 -07:00
bcma
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-09-08 11:14:56 -04:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-09-13 09:39:55 -07:00
bluetooth
Bluetooth: Remove typedef bt3c_info_t
2014-08-14 08:49:26 +02:00
bus
bus: arm-ccn: Move event cleanup routine
2014-09-05 13:25:01 -07:00
cdrom
…
char
virtio-rng: skip reading when we start to remove the device
2014-09-11 22:28:38 +09:30
clk
clk/efm32gg: fix dt init prototype
2014-09-09 13:52:18 -07:00
clocksource
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
connector
…
cpufreq
cpufreq / OPP: Fix the order of arguments for kcalloc()
2014-09-08 00:02:58 +02:00
cpuidle
ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number
2014-08-27 15:40:45 +01:00
crypto
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-08-14 18:10:33 -06:00
dca
…
devfreq
…
dio
…
dma
dmaengine: jz4740: Fix non-cyclic descriptor completion
2014-09-11 10:54:25 +05:30
dma-buf
dma-buf/fence: Fix a kerneldoc warning
2014-08-28 11:59:09 +05:30
edac
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2014-08-15 17:56:45 -06:00
eisa
…
extcon
…
firewire
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
firmware
efi/arm64: Fix fdt-related memory reservation
2014-09-09 07:51:09 +01:00
fmc
…
gpio
gpio: bt8xx: fix release of managed resources
2014-08-29 14:31:43 +02:00
gpu
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2014-09-20 10:10:14 -07:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-08-27 09:38:06 -07:00
hsi
Merge tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
2014-08-06 20:06:14 -07:00
hv
Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-08-04 17:32:24 -07:00
hwmon
hwmon: (ds1621) Update zbits after conversion rate change
2014-08-28 11:18:47 -07:00
hwspinlock
hwspinlock: enable OMAP build for AM33xx, AM43xx & DRA7xx
2014-07-29 11:46:28 +03:00
i2c
Revert "i2c: rcar: remove spinlock"
2014-09-04 19:59:42 +02:00
ide
ide: use module_platform_driver()
2014-08-05 21:16:46 -07:00
idle
intel_idle: Broadwell support
2014-08-15 17:06:40 -04:00
iio
iio:magnetometer: bugfix magnetometers gain values
2014-09-14 18:21:23 +01:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-09-22 18:23:33 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-09-15 15:12:01 -07:00
iommu
iommu/fsl: Fix warning resulting from adding PCI device twice
2014-09-05 16:01:46 +02:00
ipack
…
irqchip
irqchip: gic-v3: Declare rdist as __percpu pointer to __iomem pointer
2014-09-03 12:08:10 +00:00
isdn
mISDN: remove DSP_NEVER_DEFINED and adjust code identation
2014-09-05 22:20:21 -07:00
leds
Revert "leds: convert blink timer to workqueue"
2014-09-02 10:02:13 -07:00
lguest
mm/vmalloc.c: clean up map_vm_area third argument
2014-08-06 18:01:19 -07:00
macintosh
Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
2014-08-07 17:23:16 -07:00
mailbox
mailbox/omap: add a parent structure for every IP instance
2014-07-29 01:57:25 -07:00
mcb
…
md
dm cache: fix race causing dirty blocks to be marked as clean
2014-09-10 11:20:47 -04:00
media
[media] af9035: new IDs: add support for PCTV 78e and PCTV 79e
2014-09-04 12:24:19 -03:00
memory
memory: Freescale CoreNet Coherency Fabric error reporting driver
2014-07-29 19:26:30 -05:00
memstick
…
message
scsi: use 'depends' instead of 'select' for SCSI_FC_ATTRS
2014-09-16 16:55:55 -04:00
mfd
mfd: twl4030-power: Fix PM idle pin configuration to not conflict with regulators
2014-08-28 15:57:55 +01:00
misc
Lattice ECP3 FPGA: Check firmware pointer
2014-09-08 14:38:14 -07:00
mmc
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-08-14 18:10:33 -06:00
mtd
Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd
2014-09-06 12:12:09 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-09-23 12:09:27 -04:00
nfc
…
ntb
ntb: Add alignment check to meet hardware requirement
2014-09-14 00:10:38 -04:00
nubus
…
of
of: mdio: honor flags passed to of_phy_connect
2014-09-19 16:27:07 -04:00
oprofile
…
parisc
parisc: dino: fix %d confusingly prefixed with 0x in format string
2014-08-27 14:35:04 +02:00
parport
drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO
2014-08-08 15:57:25 -07:00
pci
Merge tag 'pci-v3.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-09-19 10:50:30 -07:00
pcmcia
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-08-07 08:50:34 -07:00
phy
phy: spear1340-miphy: fix driver dependencies
2014-09-12 11:35:31 +05:30
pinctrl
pinctrl: baytrail: resolve unbalanced IRQ wake disable warning
2014-09-10 14:25:51 +02:00
platform
toshiba_acpi: fix and cleanup toshiba_kbd_bl_mode_store()
2014-09-03 10:45:12 -07:00
pnp
ACPI / PNP: Fix acpi_pnp_match()
2014-07-30 00:23:09 +02:00
power
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
powercap
powercap / RAPL: change domain detection message
2014-09-03 01:29:00 +02:00
pps
…
ps3
…
ptp
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-12 12:15:14 -06:00
pwm
pwm: Fix period and polarity in pwm_get() for non-perfect matches
2014-08-18 10:58:43 +02:00
rapidio
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-12 12:15:14 -06:00
ras
…
regulator
regulator: remove unnecessary of_node_get() to parent
2014-09-10 11:35:02 +01:00
remoteproc
…
reset
…
rpmsg
…
rtc
drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified
2014-08-29 16:28:16 -07:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-09-08 08:27:00 -07:00
sbus
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2014-08-05 18:57:18 -07:00
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-09-22 18:23:33 -07:00
sfi
…
sh
sh: intc: Confine SH_INTC to platforms that need it
2014-08-22 12:28:16 +09:00
sn
…
soc
…
spi
Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/sirf' into spi-linus
2014-09-16 16:20:19 -07:00
spmi
…
ssb
ssb: add PCI ID 0x4351
2014-08-25 15:39:22 -04:00
staging
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-09-23 12:09:27 -04:00
target
iscsi-target: avoid NULL pointer in iscsi_copy_param_list failure
2014-09-17 13:44:01 -07:00
tc
…
thermal
…
thunderbolt
thunderbolt: Clear hops before overwriting
2014-08-26 14:54:48 -07:00
tty
tty: xuartps: Fix tx_emtpy() callback
2014-09-08 16:33:56 -07:00
uio
…
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-09-23 12:09:27 -04:00
uwb
uwb: init beacon cache entry before registering uwb device
2014-09-08 16:03:21 -07:00
vfio
drivers/vfio: Enable VFIO if EEH is not supported
2014-08-08 10:39:16 -06:00
vhost
…
video
video: ARM CLCD: Fix color model capabilities for DT platforms
2014-09-12 11:45:10 +03:00
virt
…
virtio
virtio_ring: unify direct/indirect code paths.
2014-09-13 12:52:35 -04:00
vlynq
…
vme
vme: bridges: use pci_zalloc_consistent
2014-08-08 15:57:30 -07:00
w1
…
watchdog
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-08-07 08:47:00 -07:00
xen
Merge tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-09-11 16:52:29 -07:00
zorro
…
Kconfig
Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-08-04 17:32:24 -07:00
Makefile
Merge tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-08-04 18:34:04 -07:00