mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-22 14:05:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
e8115e79aa62b6ebdb3e8e61ca4092cc32938afc
linux/drivers
History
Dave Airlie e8115e79aa Merge tag 'v3.18-rc7' into drm-next 
This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
2014-12-02 10:58:33 +10:00
..
accessibility
…
acpi
ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
2014-11-20 01:24:16 +01:00
amba
PM / Domains: Move dev_pm_domain_attach|detach() to pm_domain.h
2014-09-30 01:16:44 +02:00
ata
ahci: fix AHCI parameters not taken into account
2014-11-04 12:56:25 -05:00
atm
solos-pci: fix error return code
2014-11-23 14:29:44 -05:00
auxdisplay
…
base
Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'
2014-11-14 15:17:32 +01:00
bcma
bcma: add another PCI ID of device with BCM43228
2014-10-23 14:02:06 -04:00
block
zram: avoid kunmap_atomic() of a NULL pointer
2014-11-13 16:17:05 -08:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
bus
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-10-08 17:37:16 -04:00
cdrom
…
char
Merge tag 'v3.18-rc7' into drm-next
2014-12-02 10:58:33 +10:00
clk
clk: pxa: fix pxa27x CCCR bit usage
2014-11-17 11:25:29 -08:00
clocksource
clockevent: sun4i: Fix race condition in the probe code
2014-11-19 10:43:51 +01:00
connector
…
cpufreq
cpufreq: Avoid crash in resume on SMP without OPP
2014-11-08 02:10:04 +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
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2014-11-21 16:24:27 -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
extcon: gpio: Fix code cleanup
2014-09-22 16:48:47 +09:00
firewire
firewire: cdev: prevent kernel stack leaking into ioctl arguments
2014-11-14 12:10:13 +01:00
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
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
gpu
Merge tag 'v3.18-rc7' into drm-next
2014-12-02 10:58:33 +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: (g762) fix call to devm_hwmon_device_register_with_groups()
2014-11-19 14:06:47 -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: accel: bmc150: set low default thresholds
2014-11-16 20:25:00 +00:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-11-21 16:28:45 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-11-27 17:51:50 -08:00
iommu
Merge tag 'iommu-updates-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
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: brcmstb-l2: Fix error handling of irq_of_parse_and_map
2014-11-26 06:28:42 +00:00
isdn
isdn/gigaset: fix usb_gigaset write_cmd result race
2014-10-14 15:05:35 -04: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
Merge tag 'md/3.18-fix' of git://neil.brown.name/md
2014-11-16 15:34:31 -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
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
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
Merge tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd
2014-11-02 14:45:52 -08:00
net
Merge tag 'master-2014-11-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-11-26 16:38:35 -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/selftest: Fix testing when /aliases is missing
2014-11-20 15:32:49 +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/MSI: Add device flag indicating that 64-bit MSIs don't work
2014-11-24 14:11:34 +11: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
platform: hp_accel: Add SERIO_I8042 as a dependency since it now includes i8042.h/serio.h
2014-11-10 21:16:15 -08:00
pnp
PNP: replace strnicmp with strncasecmp
2014-10-14 02:18:25 +02:00
power
Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6
2014-11-15 15:22:51 -08:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
Merge tag 'pwm/for-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
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
KVM: s390: virtio_ccw: remove unused variable
2014-11-03 10:43:00 +01:00
sbus
…
scsi
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2014-11-29 10:15:31 -08: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/dw' and 'spi/fix/sirf' into spi-linus
2014-11-26 19:05:25 +00:00
spmi
…
ssb
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
staging
Merge tag 'v3.18-rc7' into drm-next
2014-12-02 10:58:33 +10:00
target
target: return CONFLICT only when SA key unmatched
2014-11-02 22:04:57 -08:00
tc
…
thermal
thermal: Exynos: Deletion of unnecessary checks before two function calls
2014-11-21 15:20:17 -04:00
thunderbolt
…
tty
Revert "serial: of-serial: add PM suspend/resume support"
2014-11-25 12:46:39 -08:00
uio
uio: Export definition of struct uio_device
2014-10-02 21:35:54 -07:00
usb
usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000
2014-11-24 17:01:55 -08:00
uwb
uwb: add an ASIE sysfs attribute to uwb_rc devices
2014-09-23 22:05:26 -07:00
vfio
Merge tag 'iommu-updates-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2014-10-15 07:23:49 +02:00
vhost
vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT
2014-10-28 13:54:16 -07:00
video
Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
2014-10-30 14:53:49 +02:00
virt
…
virtio
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
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
…