iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/chelsio/cxgb4vf/sge.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-14 01:01:12 -05:00
..
accessibility
…
acpi
Merge branches 'acpi-scan' and 'acpi-ec'
2014-10-31 22:24:44 +01:00
amba
PM / Domains: Move dev_pm_domain_attach|detach() to pm_domain.h
2014-09-30 01:16:44 +02:00
ata
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
atm
atm: simplify lanai.c by using module_pci_driver
2014-10-17 11:55:32 -04:00
auxdisplay
…
base
tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP
2014-11-07 11:07:35 -08:00
bcma
Merge tag 'master-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
2014-11-10 14:34:59 -05:00
block
zram: avoid kunmap_atomic() of a NULL pointer
2014-11-13 16:17:05 -08:00
bluetooth
Bluetooth: HCI H5 peer reset detection
2014-10-31 19:54:34 +02:00
bus
ARM: SoC driver updates for 3.18
2014-10-08 17:37:16 -04:00
cdrom
…
char
virtio: bugfix for 3.18
2014-11-13 18:07:52 -08:00
clk
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
clocksource
ARM/ARM64: arch-timer: fix arch_timer_probed logic
2014-10-26 20:50:00 +01:00
connector
…
cpufreq
cpufreq: cpufreq-dt: Restore default cpumask_setall(policy->cpus)
2014-10-27 23:27:35 +01:00
cpuidle
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-10-24 12:48:47 -07:00
crypto
crypto: caam - fix missing dma unmap on error path
2014-11-06 23:10:20 +08:00
dca
…
devfreq
PM / devfreq: exynos: Enable building exynos PPMU as module
2014-09-29 20:22:36 +09:00
dio
…
dma
dma: edma: move device registration to platform code
2014-11-05 18:26:10 -08:00
dma-buf
dma-buf: don't open-code atomic_long_read()
2014-10-09 02:39:07 -04:00
edac
e7xxx_edac: Report CE events properly
2014-10-22 22:59:00 +02:00
eisa
…
extcon
…
firewire
…
firmware
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-23 14:45:09 -07:00
fmc
…
gpio
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
gpu
Merge tag 'drm-intel-fixes-2014-11-07' of git://anongit.freedesktop.org/drm-intel into drm-fixes
2014-11-10 10:05:37 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-11-13 16:19:14 -08:00
hsi
…
hv
Drivers: hv: vmbus: Enable interrupt driven flow control
2014-09-23 23:31:22 -07:00
hwmon
hwmon: (fam15h_power) Fix NB device ID for F16h M30h
2014-11-11 10:39:45 -08:00
hwspinlock
…
i2c
i2c: core: Dispose OF IRQ mapping at client removal time
2014-11-07 19:03:18 +01:00
ide
Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block
2014-10-18 12:12:45 -07:00
idle
…
iio
iio: as3935: allocate correct iio_device size
2014-11-05 18:33:46 +00:00
infiniband
net/mlx4_core: Flexible (asymmetric) allocation of EQs and MSI-X vectors for PF/VFs
2014-11-13 15:16:21 -05:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-10-31 19:51:11 -07:00
iommu
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
ipack
ipoctal: clear break interrupt as soon as it occurs
2014-09-23 23:26:42 -07:00
irqchip
irqchip: armada-370-xp: Fix MPIC interrupt handling
2014-11-02 01:31:10 +00:00
isdn
net: Add and use skb_copy_datagram_msg() helper.
2014-11-05 16:46:40 -05:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-10-21 08:18:38 -07:00
lguest
…
macintosh
powerpc: Move via-cuda symbol exports next to function definitions
2014-09-25 23:14:37 +10:00
mailbox
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2014-10-21 11:21:19 -07:00
mcb
…
md
. stable fix for dm-thin that avoids normal IO racing with discard
2014-11-13 09:19:20 -08:00
media
[media] sp2: sp2_init() can be static
2014-11-03 19:08:06 -02:00
memory
…
memstick
memstick: r592: fix build warnings for !PM_SLEEP
2014-10-14 02:18:22 +02:00
message
SCSI for-linus on 20141007
2014-10-07 21:29:18 -04:00
mfd
mfd: twl4030-power: Fix poweroff with PM configuration enabled
2014-11-10 15:22:04 +00:00
misc
cxl: Fix PSL error due to duplicate segment table entries
2014-10-28 19:52:52 +11:00
mmc
mmc: core: fix card detection regression
2014-11-05 09:28:48 +01:00
mtd
Three main MTD fixes for 3.18:
2014-11-02 14:45:52 -08:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-14 01:01:12 -05:00
nfc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-10-07 14:48:29 -04:00
ntb
ntb: Adding split BAR support for Haswell platforms
2014-10-17 07:08:51 -04:00
nubus
…
of
of: Fix overflow bug in string property parsing functions
2014-11-04 10:19:48 +00:00
oprofile
…
parisc
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
parport
parport: parport_pc: Implement architecture and device check to cut off false-positives
2014-09-23 23:14:28 -07:00
pci
PCI updates for v3.18:
2014-10-31 18:48:29 -07:00
pcmcia
…
phy
phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
2014-11-05 14:34:06 -08:00
pinctrl
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
2014-10-28 11:16:26 +01:00
platform
quirk for Lenovo Yoga 3: no rfkill switch
2014-10-27 21:45:13 -07:00
pnp
PNP: replace strnicmp with strncasecmp
2014-10-14 02:18:25 +02:00
power
power: reset: at91-reset: fix power down register
2014-10-22 10:08:22 +02:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
pwm: Changes for v3.18-rc1
2014-10-21 08:17:43 -07:00
rapidio
…
ras
…
regulator
Merge remote-tracking branches 'regulator/fix/max1586', 'regulator/fix/max77686', 'regulator/fix/max77693', 'regulator/fix/max77802', 'regulator/fix/max8860' and 'regulator/fix/s2mpa01' into regulator-linus
2014-11-05 14:59:25 +00:00
remoteproc
…
reset
…
rpmsg
…
rtc
drivers/rtc/rtc-bq32k.c: fix register value
2014-10-29 16:33:14 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-14 01:01:12 -05:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-14 01:01:12 -05:00
sfi
…
sh
…
sn
…
soc
soc: versatile: Add terminating entry for realview_soc_of_match
2014-10-28 22:05:07 +01:00
spi
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus
2014-11-06 12:58:46 +00:00
spmi
…
ssb
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
staging
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-14 01:01:12 -05:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-10-21 13:06:38 -07:00
tc
…
thermal
imx: thermal: imx_get_temp might be called before sensor clock is prepared
2014-11-09 15:42:53 -04:00
thunderbolt
…
tty
tty: Fix pty master poll() after slave closes v2
2014-11-06 12:23:36 -08:00
uio
uio: Export definition of struct uio_device
2014-10-02 21:35:54 -07:00
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-11-14 01:01:12 -05:00
uwb
uwb: add an ASIE sysfs attribute to uwb_rc devices
2014-09-23 22:05:26 -07:00
vfio
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
vhost
…
video
Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
2014-10-30 14:53:49 +02:00
virt
…
virtio
One cc: stable commit, the rest are a series of minor cleanups which have
2014-10-18 10:25:09 -07:00
vlynq
…
vme
…
w1
…
watchdog
watchdog: meson: remove magic value for reboot
2014-10-20 21:09:17 +02:00
xen
xen/pci: Allocate memory for physdev_pci_device_add's optarr
2014-10-23 16:24:02 +01:00
zorro
…
Kconfig
soc: ti: add Keystone Navigator QMSS driver
2014-09-24 09:49:14 -04:00
Makefile
…