breeze/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-02-04 15:28:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
4300a0f8bdcce5a03b88bfa16fc9827e15c52dc4
linux/drivers
History
Dave Airlie 4300a0f8bd Merge tag 'v3.10-rc7' into drm-next 
Linux 3.10-rc7

The sdvo lvds fix in this -fixes pull

commit c3456fb3e4
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Mon Jun 10 09:47:58 2013 +0200

    drm/i915: prefer VBT modes for SVDO-LVDS over EDID

has a silent functional conflict with

commit 990256aec2
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Fri May 31 12:17:07 2013 +0000

    drm: Add probed modes in probe order

in drm-next. W simply need to add the vbt modes before edid modes, i.e. the
other way round than now.

Conflicts:
	drivers/gpu/drm/drm_prime.c
	drivers/gpu/drm/i915/intel_sdvo.c
2013-06-27 20:40:44 +10:00
..
accessibility
…
acpi
ACPI / LPSS: Power up LPSS devices during enumeration
2013-06-20 00:49:06 +02:00
amba
…
ata
Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2013-06-03 17:55:09 +09:00
atm
…
auxdisplay
…
base
firmware loader: fix use-after-free by double abort
2013-06-18 10:41:55 -07:00
bcma
bcma: add more core IDs
2013-05-17 14:31:05 -04:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2013-06-21 06:27:40 -10:00
bluetooth
Bluetooth: btmrvl: support Marvell Bluetooth device SD8897
2013-06-12 10:20:54 -04:00
bus
…
cdrom
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
char
Merge tag 'v3.10-rc7' into drm-next
2013-06-27 20:40:44 +10:00
clk
ARM: tegra30: clocks: Fix pciex clock registration
2013-06-16 11:25:45 -07:00
clocksource
Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-07 11:28:42 -07:00
connector
…
cpufreq
cpufreq: cpufreq-cpu0: use the exact frequency for clk_set_rate()
2013-06-05 13:51:29 +02:00
cpuidle
…
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-06-10 13:25:50 -07:00
dca
…
devfreq
…
dio
…
dma
dmatest: do not allow to interrupt ongoing tests
2013-06-08 02:13:44 +05:30
edac
amd64_edac: Fix bogus sysfs file permissions
2013-05-21 09:13:11 +02:00
eisa
…
extcon
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
2013-05-09 09:59:16 -07:00
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2013-05-09 10:11:48 -07:00
firmware
efivar: fix oops in efivar_update_sysfs_entries() caused by memory reuse
2013-05-13 20:20:02 +01:00
gpio
Merge tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2013-05-23 18:24:10 -07:00
gpu
Merge tag 'v3.10-rc7' into drm-next
2013-06-27 20:40:44 +10:00
hid
HID: multitouch: prevent memleak with the allocated name
2013-06-12 11:13:38 +02:00
hsi
…
hv
Drivers: hv: Fix a bug in get_vp_index()
2013-05-21 09:56:55 -07:00
hwmon
hwmon: (adm1021) Strengthen chip detection for ADM1021, LM84 and MAX1617
2013-06-07 12:29:31 -07:00
hwspinlock
Merge tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
2013-05-07 14:01:27 -07:00
i2c
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-05-21 11:11:45 -07:00
ide
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
idle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2013-05-11 15:23:17 -07:00
iio
iio:inkern: Fix typo/bug in convert raw to processed.
2013-06-04 18:46:45 +01:00
infiniband
Merge branches 'iser' and 'qib' into for-next
2013-06-04 17:06:46 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-06-05 09:11:06 +09:00
iommu
Merge tag 'iommu-updates-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2013-05-06 14:59:13 -07:00
ipack
…
irqchip
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-06-22 09:44:45 -10:00
isdn
isdn/kcapi: fix a small underflow
2013-05-20 13:38:14 -07:00
leds
drivers/leds/leds-ot200.c: fix error caused by shifted mask
2013-05-24 16:22:51 -07:00
lguest
lguest: clear cached last cpu when guest_set_pgd() called.
2013-05-08 10:49:18 +09:30
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
mailbox
…
md
Merge tag 'md-3.10-fixes' of git://neil.brown.name/md
2013-06-13 10:13:29 -07:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-06-22 08:43:17 -10:00
memory
drivers/memory: don't check resource with devm_ioremap_resource
2013-05-18 11:55:52 +02:00
memstick
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
message
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
mfd
Merge tag 'mfd-fixes-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes
2013-05-22 07:18:41 -07:00
misc
Merge tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2013-06-14 19:15:36 -10:00
mmc
mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case
2013-05-26 14:23:11 -04:00
mtd
drivers/mtd/nand: don't check resource with devm_ioremap_resource
2013-05-18 11:55:55 +02:00
net
lseek(fd, n, SEEK_END) does *not* go to eof - n
2013-06-16 08:10:53 -10:00
nfc
NFC: mei: Do not disable MEI devices from their remove routine
2013-05-21 10:48:41 +02:00
ntb
NTB: Multiple NTB client fix
2013-05-15 10:58:22 -07:00
nubus
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
of
of: Fix locking vs. interrupts
2013-06-13 22:12:14 +01:00
oprofile
…
parisc
parisc: fix serial ports on C8000 workstation
2013-06-18 20:29:07 +02:00
parport
parisc: parport0: fix this legacy no-device port driver!
2013-06-01 14:46:42 +02:00
pci
aerdrv: Move cper_print_aer() call out of interrupt context
2013-05-30 10:51:20 -07:00
pcmcia
…
pinctrl
Merge tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
2013-06-07 18:11:02 -07:00
platform
x86 / platform / hp_wmi: Fix bluetooth_rfkill misuse in hp_wmi_rfkill_setup()
2013-06-01 23:51:48 +02:00
pnp
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
power
Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6
2013-05-25 20:32:49 -07:00
pps
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
ps3
…
ptp
ptp_pch: fix error handling in pch_probe()
2013-05-25 21:24:15 -07:00
pwm
drivers/pwm: don't check resource with devm_ioremap_resource
2013-05-18 11:55:58 +02:00
rapidio
rapidio/tsi721: fix bug in MSI interrupt handling
2013-05-24 16:22:51 -07:00
regulator
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus
2013-05-30 11:58:40 +01:00
remoteproc
Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
2013-05-07 14:04:56 -07:00
reset
…
rpmsg
Merge tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg
2013-05-07 14:02:00 -07:00
rtc
rtc-at91rm9200: use shadow IMR on at91sam9x5
2013-06-12 16:29:46 -07:00
s390
netiucv: Hold rtnl between name allocation and device registration.
2013-06-13 17:41:18 -07:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-06-22 08:54:06 -10:00
sfi
…
sh
…
sn
…
spi
Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
2013-06-04 18:52:05 +01:00
ssb
Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd
2013-05-09 10:15:46 -07:00
ssbi
…
staging
Merge tag 'v3.10-rc7' into drm-next
2013-06-27 20:40:44 +10:00
target
iscsi-target: Remove left over v3.10-rc debug printks
2013-06-20 16:47:41 -07:00
tc
…
thermal
drivers/thermal: don't check resource with devm_ioremap_resource
2013-05-18 11:57:30 +02:00
tty
Merge tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2013-06-22 09:00:28 -10:00
uio
uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
2013-05-21 10:13:23 -07:00
usb
USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable
2013-06-19 15:54:45 -07:00
uwb
uwb: rename random32() to prandom_u32()
2013-04-29 18:28:43 -07:00
vfio
vfio: fix crash on rmmod
2013-06-05 08:54:16 -06:00
vhost
vhost: fix ubuf_info cleanup
2013-06-11 02:46:21 -07:00
video
Merge tag 'v3.10-rc7' into drm-next
2013-06-27 20:40:44 +10:00
virt
…
virtio
…
vlynq
…
vme
…
w1
drivers/w1/masters: don't check resource with devm_ioremap_resource
2013-05-18 11:58:03 +02:00
watchdog
drivers/watchdog: don't check resource with devm_ioremap_resource
2013-05-18 11:58:04 +02:00
xen
xen/tmem: Don't over-write tmem_frontswap_poolid after tmem_frontswap_init set it.
2013-06-10 10:14:33 -04:00
zorro
proc: Supply PDE attribute setting accessor functions
2013-05-01 17:29:18 -04:00
Kconfig
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-04 12:31:18 -07:00
Makefile
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-05-04 12:31:18 -07:00