mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-22 23:31:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
93bb70e0c00f1be4cc857e4d8375c44058cce71e
linux/drivers
T
History
Dave Airlie 93bb70e0c0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next 
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_modes.c
2012-08-27 16:22:20 +10:00
..
accessibility
…
acpi
Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
2012-08-22 09:18:49 +10:00
amba
…
ata
libata: Add a space to " 2GB ATA Flash Disk" DMA blacklist entry
2012-08-25 10:16:45 -04:00
atm
drivers/atm/iphase.c: fix error return code
2012-08-06 13:29:57 -07:00
auxdisplay
…
base
Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-08-20 13:13:47 -07:00
bcma
bcma: BCM43228 support
2012-08-02 13:51:46 -04:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2012-08-25 11:36:43 -07:00
bluetooth
Bluetooth: add support for atheros 0489:e057
2012-08-06 15:33:05 -03:00
cdrom
…
char
drm/i915: fix hsw uncached pte
2012-08-17 09:21:35 +02:00
clk
clk: validate pointer in __clk_disable()
2012-07-30 17:25:13 -07:00
clocksource
cs5535-clockevt: typo, it's MFGPT, not MFPGT
2012-08-21 16:45:02 -07:00
connector
…
cpufreq
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
2012-08-23 17:02:42 +02:00
cpuidle
cpuidle: Prevent null pointer dereference in cpuidle_coupled_cpu_notify
2012-08-17 19:37:08 +02:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-08-23 21:58:04 -07:00
dca
…
devfreq
…
dio
…
dma
dma: tegra: enable/disable dma clock
2012-08-13 10:15:22 +05:30
edac
…
eisa
…
extcon
extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one
2012-08-16 10:29:08 -07:00
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2012-07-30 09:32:39 -07:00
firmware
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
gpio
GPIO: gpio-pxa: fix building without CONFIG_OF
2012-08-14 07:50:36 +03:00
gpu
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
2012-08-27 16:22:20 +10:00
hid
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2012-08-23 21:45:54 -07:00
hsi
…
hv
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
hwmon
hwmon: (asus_atk0110) Add quirk for Asus M5A78L
2012-08-22 22:33:31 -07:00
hwspinlock
…
i2c
i2c: tegra: protect suspend/resume callbacks with CONFIG_PM_SLEEP
2012-08-18 20:45:09 +02:00
ide
ide: fix generic_ide_suspend/resume Oops
2012-08-21 14:54:42 -07:00
idle
intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
2012-08-17 19:37:14 +02:00
ieee802154
…
iio
iio: lm3533-als: Fix build warnings
2012-08-16 20:24:38 +01:00
infiniband
Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next
2012-08-16 09:38:39 -07:00
input
Input: eeti_ts: pass gpio value instead of IRQ
2012-08-09 15:16:41 +02:00
iommu
iommu/amd: Fix wrong check for ARRAY_SIZE()
2012-08-10 11:34:08 +02:00
isdn
mISDN: Bugfix for layer2 fixed TEI mode
2012-08-06 13:22:50 -07:00
leds
leds: renesas: fix error handling
2012-08-13 14:34:02 +08:00
lguest
…
macintosh
…
md
md/raid10: fix problem with on-stack allocation of r10bio structure.
2012-08-18 09:51:42 +10:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-08-21 16:54:38 -07:00
memory
…
memstick
…
message
drivers/message/i2o/i2o_config.c: bound allocation
2012-07-30 17:25:17 -07:00
mfd
Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-08-20 13:14:22 -07:00
misc
drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources
2012-08-21 16:45:03 -07:00
mmc
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
mtd
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-08-12 21:31:44 +03:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-21 16:46:08 -07:00
nfc
…
nubus
…
of
dt: introduce for_each_available_child_of_node, of_get_next_available_child
2012-08-20 02:16:00 -07:00
oprofile
…
parisc
…
parport
…
pci
PCI: EHCI: Fix crash during hibernation on ASUS computers
2012-08-15 11:51:19 -06:00
pcmcia
…
pinctrl
pinctrl/nomadik: add kp_b_2 keyboard function group list
2012-08-17 11:09:58 +02:00
platform
ideapad: add Lenovo IdeaPad Z570 support (part 3)
2012-08-20 12:44:41 -04:00
pnp
…
power
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
2012-08-02 11:52:39 -07:00
pps
pps: return PTR_ERR on error in device_create
2012-07-30 17:25:21 -07:00
ps3
…
ptp
…
pwm
pwm: Improve Kconfig help text
2012-08-20 11:58:43 +02:00
rapidio
rapidio/tsi721: fix unused variable compiler warning
2012-08-21 16:45:03 -07:00
regulator
regulator: twl-regulator: fix up VINTANA1/VINTANA2
2012-08-15 17:19:01 +01:00
remoteproc
…
rpmsg
…
rtc
drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode
2012-08-21 16:45:03 -07:00
s390
s390/sclp_sdias: Add missing break and "fall through"
2012-08-08 07:32:55 -07:00
sbus
…
scsi
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
sfi
…
sh
sh: intc: Handle domain association for sparseirq pre-allocated vectors.
2012-08-09 13:21:05 +09:00
sn
…
spi
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-08-25 11:45:04 -07:00
ssb
…
staging
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
2012-08-27 16:22:20 +10:00
target
target: Remove unused se_cmd.cmd_spdtl
2012-08-21 14:27:35 -07:00
tc
…
thermal
Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6
2012-07-31 18:08:25 -07:00
tty
pmac_zilog,kdb: Fix console poll hook to return instead of loop
2012-08-16 12:20:20 -07:00
uio
…
usb
Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-08-20 13:14:22 -07:00
uwb
…
vfio
vfio: grab vfio_device reference *before* exposing the sucker via fd_install()
2012-08-22 10:26:42 -04:00
vhost
tcm_vhost: Fix vhost_scsi_target structure alignment
2012-08-20 14:52:11 -07:00
video
fbcon: fix race condition between console lock and cursor timer (v1.1)
2012-08-22 14:00:35 +10:00
virt
…
virtio
…
vlynq
…
vme
…
w1
1-Wire: Add support for the maxim ds1825 temperature sensor
2012-08-16 12:33:59 -07:00
watchdog
booke/wdt: some ioctls do not return values properly
2012-08-17 09:03:51 -05:00
xen
Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2012-08-25 17:31:59 -07:00
zorro
…
Kconfig
vfio: VFIO core
2012-07-31 08:16:22 -06:00
Makefile
vfio: VFIO core
2012-07-31 08:16:22 -06:00