Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-12 16:11:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-stable/drivers
History
Johannes Berg 944b9e375d Merge remote-tracking branch 'mac80211/master' into mac80211-next 
Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2012-09-06 15:56:02 +02:00
..
accessibility
…
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
amba
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
ata
[libata] pata_cmd64x: whitespace cleanup
2012-07-25 16:07:40 -04:00
atm
…
auxdisplay
…
base
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
bcma
Merge remote-tracking branch 'mac80211/master' into mac80211-next
2012-09-06 15:56:02 +02:00
block
Power management updates for 3.6
2012-07-22 13:36:52 -07:00
bluetooth
Bluetooth: Introduce a flags variable to Three-wire UART state
2012-07-17 14:49:24 -03:00
cdrom
…
char
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-26 14:18:18 -07:00
clk
The common clk framework changes for 3.6 include a small number of core
2012-07-24 16:40:57 -07:00
clocksource
arm-soc: new SoC support
2012-07-23 16:31:31 -07:00
connector
drivers: connector: fixed coding style issues
2012-07-16 23:23:52 -07:00
cpufreq
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
cpuidle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
crypto
ARM: SoC fixes
2012-07-26 20:29:52 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
edac
…
eisa
…
extcon
extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
2012-07-17 10:34:56 -07:00
firewire
…
firmware
…
gpio
GPIO changes for v3.6:
2012-07-26 13:56:38 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-26 14:18:18 -07:00
hid
Merge branch 'next' into for-linus
2012-07-24 22:43:04 -07:00
hsi
…
hv
Drivers: hv: Change the hex constant to a decimal constant
2012-07-19 15:27:33 -07:00
hwmon
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
hwspinlock
hwspinlock/core: use global ID to register hwspinlocks on multiple devices
2012-07-07 22:35:30 +03:00
i2c
i2c-omap: Add support for I2C_M_STOP message flag
2012-07-24 14:13:59 +02:00
ide
…
idle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
ieee802154
drivers/ieee802154/at86rf230: rework irq handler
2012-07-12 07:54:45 -07:00
iio
iio: fix pointer cast warning
2012-07-15 17:33:17 +01:00
infiniband
InfiniBand/RDMA changes for the 3.6 merge window:
2012-07-24 13:56:26 -07:00
input
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
iommu
IOMMU Updates for Linux v3.6-rc1
2012-07-24 16:24:11 -07:00
isdn
ISDN: Add check for usb_alloc_urb() result
2012-07-18 09:40:54 -07:00
leds
leds-lp8788: forgotten unlock at lp8788_led_work
2012-07-27 08:16:07 +08:00
lguest
…
macintosh
…
md
Three fixes for device-mapper discard processing:
2012-07-20 11:51:22 -07:00
media
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
memory
…
memstick
…
message
…
mfd
Linux 3.5-rc7
2012-07-15 21:49:21 +01:00
misc
CHAR/MISC patches for 3.6-rc1
2012-07-26 12:15:41 -07:00
mmc
ARM: SoC fixes
2012-07-26 20:29:52 -07:00
mtd
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
2012-07-25 21:37:09 +02:00
net
Merge remote-tracking branch 'mac80211/master' into mac80211-next
2012-09-06 15:56:02 +02:00
nfc
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
nubus
…
of
Devicetree updates for 3.6
2012-07-24 14:07:22 -07:00
oprofile
oprofile, perf: Use per-cpu framework
2012-06-22 16:31:20 +02:00
parisc
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
parport
…
pci
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
pcmcia
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
pinctrl
Pin control changes for v3.6:
2012-07-24 14:05:46 -07:00
platform
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
pnp
ACPI/PM: specify lowest allowed state for device sleep state
2012-06-23 10:41:09 -06:00
power
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
pps
…
ps3
…
ptp
…
rapidio
…
regulator
SCSI misc on 20120724
2012-07-24 18:11:22 -07:00
remoteproc
A batch of remoteproc patches for 3.6:
2012-07-26 16:19:08 -07:00
rpmsg
A batch of remoteproc patches for 3.6:
2012-07-26 16:19:08 -07:00
rtc
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
2012-07-25 21:37:09 +02:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-26 18:09:01 -07:00
sbus
…
scsi
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
sfi
…
sh
Merge branch 'common/pinctrl' into sh-latest
2012-07-20 16:42:59 +09:00
sn
…
spi
spi: Updates for 3.6
2012-07-26 12:57:41 -07:00
ssb
…
staging
mac80211: move TX station pointer and restructure TX
2012-07-31 16:18:39 +02:00
target
iscsi-target: Drop bogus struct file usage for iSCSI/SCTP
2012-07-21 02:44:13 -07:00
tc
…
thermal
Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release
2012-07-26 00:03:58 -04:00
tty
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
uio
…
usb
ARM: SoC fixes
2012-07-26 20:29:52 -07:00
uwb
…
vhost
vhost: make vhost work queue visible
2012-07-22 01:22:23 +03:00
video
radeonfb: Add quirk for the graphics adapter in some JSxx
2012-07-27 11:42:33 +10:00
virt
…
virtio
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
vlynq
…
vme
VME: Prevent D16 cycles being split into 8-bit blocks
2012-07-19 15:39:39 -07:00
w1
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
watchdog
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
xen
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
zorro
…
Kconfig
…
Makefile
…