mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4a0b5ec12f0ffc3024616e6dc62cf8a04c54edcd
linux/drivers
History
David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-01 13:36:50 -04:00
..
accessibility
…
acpi
PCI / ACPI: hold acpi_scan_lock during root bus hotplug
2013-03-27 00:06:07 +01:00
amba
ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME
2013-03-15 17:20:02 +00:00
ata
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2013-03-23 12:33:36 -07:00
atm
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
auxdisplay
…
base
Merge tag 'pm+acpi-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2013-03-07 14:54:28 -08:00
bcma
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-03-18 09:39:21 -04:00
block
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-01 08:06:30 -07:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2013-03-18 15:17:11 -04:00
bus
…
cdrom
…
char
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-03-12 20:28:45 -07:00
clk
clk: vt8500: Fix "fix device clock divisor calculations"
2013-03-14 22:34:26 +01:00
clocksource
Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
2013-03-03 12:06:09 -08:00
connector
connector: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-28 14:27:44 -04:00
cpufreq
cpufreq: acpi-cpufreq: Don't set policy->related_cpus from .init()
2013-03-25 15:13:32 +01:00
cpuidle
Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-02-21 15:27:22 -08:00
crypto
Revert "crypto: caam - add IPsec ESN support"
2013-03-21 17:36:03 +08:00
dca
dca: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
devfreq
…
dio
…
dma
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-01 13:36:50 -04:00
edac
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
eisa
…
extcon
extcon: max77693: Initialize register of MUIC device to bring up it without platform data
2013-03-13 17:38:57 +09:00
firewire
net: add ETH_P_802_3_MIN
2013-03-28 01:20:42 -04:00
firmware
efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
2013-03-22 20:08:01 +00:00
gpio
Merge tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2013-03-24 10:11:29 -07:00
gpu
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into HEAD
2013-03-25 12:20:00 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2013-03-27 11:18:43 -07:00
hsi
hsi: fix kernel-doc warnings
2013-03-01 13:39:00 -08:00
hv
Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts
2013-02-27 10:15:53 -08:00
hwmon
hwmon: (lm75.h) Update header inclusion
2013-03-18 21:19:49 +01:00
hwspinlock
…
i2c
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-03-23 12:32:14 -07:00
ide
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
idle
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
iio
Merge tag 'iio-fixes-for-3.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
2013-03-06 05:48:24 +08:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-03-27 13:52:49 -04:00
input
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-03-18 08:17:14 -07:00
iommu
Merge tag 'iommu-fixes-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2013-03-27 09:25:11 -07:00
ipack
Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2013-02-21 13:57:13 -08:00
irqchip
irqchip: fix typo when moving gic_raise_softirq()
2013-03-04 17:15:33 -08:00
isdn
net: add ETH_P_802_3_MIN
2013-03-28 01:20:42 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-02-26 09:29:02 -08:00
lguest
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-02-26 14:49:12 -08:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
mailbox
mailbox, pl320-ipc: remove __init from probe function
2013-03-04 14:23:11 +01:00
md
Merge tag 'md-3.9-fixes' of git://neil.brown.name/md
2013-03-23 15:49:49 -07:00
media
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-01 13:36:50 -04:00
memory
…
memstick
memstick: move the dereference below the NULL test
2013-02-27 19:10:23 -08:00
message
…
mfd
mfd: twl4030-madc: Remove __exit_p annotation
2013-03-15 07:42:22 +01:00
misc
VMCI: Fix process-to-process DRGAMs.
2013-03-15 12:58:12 -07:00
mmc
Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus
2013-03-03 00:32:50 +00:00
mtd
Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd
2013-03-18 08:27:41 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-01 13:36:50 -04:00
nfc
NFC: microread: Fix MEI build failure
2013-03-10 22:20:04 +01:00
ntb
…
nubus
…
of
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
oprofile
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
parisc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
parport
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-02-21 17:54:03 -08:00
pci
PCI: Use ROM images from firmware only if no other ROM source available
2013-03-19 14:51:14 -07:00
pcmcia
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
pinctrl
Merge tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2013-03-24 10:11:29 -07:00
platform
Platform: x86: chromeos_laptop : Add basic platform data for atmel devices
2013-03-08 16:03:29 -08:00
pnp
ACPI / glue: Add .match() callback to struct acpi_bus_type
2013-03-04 14:23:40 +01:00
power
power: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
pps
drivers/pps/clients/pps-gpio.c: use devm_kzalloc
2013-02-27 19:10:23 -08:00
ps3
…
ptp
ptp_pch: eliminate a number of sparse warnings
2013-03-27 12:48:31 -04:00
pwm
Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm
2013-02-26 09:34:29 -08:00
rapidio
…
regulator
Merge remote-tracking branch 'regulator/fix/twl' into tmp
2013-03-05 10:12:43 +08:00
remoteproc
remoteproc: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
rpmsg
rpmsg: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
rtc
drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR
2013-03-22 16:41:20 -07:00
s390
virtio: remove obsolete virtqueue_get_queue_index()
2013-03-22 10:23:34 -04:00
sbus
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
scsi
scsi: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-28 14:27:24 -04:00
sfi
…
sh
…
sn
…
spi
Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2013-02-21 15:27:22 -08:00
ssb
ssb: pci: Fix flipping of MAC address
2013-03-13 14:23:02 -04:00
staging
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-01 13:36:50 -04:00
target
target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
2013-03-28 23:42:47 -07:00
tc
…
thermal
thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.
2013-03-11 23:09:29 +08:00
tty
Merge tag 'tty-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2013-03-28 15:53:33 -07:00
uio
uio: convert to idr_alloc()
2013-02-27 19:10:19 -08:00
usb
usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
2013-03-28 08:50:22 -07:00
uwb
…
vfio
vfio: include <linux/slab.h> for kmalloc
2013-03-15 12:58:20 -06:00
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-03-30 13:13:05 -07:00
video
Merge tag 'fbdev-fixes-3.9-rc4' of git://gitorious.org/linux-omap-dss2/linux
2013-03-28 13:44:40 -07:00
virt
…
virtio
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-02-26 14:49:12 -08:00
vlynq
…
vme
…
w1
w1: fix oops when w1_search is called from netlink connector
2013-03-12 16:20:46 -07:00
watchdog
watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2
2013-03-22 23:21:55 +01:00
xen
Merge tag 'stable/for-linus-3.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2013-03-27 12:56:25 -07:00
zorro
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
Kconfig
Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2013-02-21 13:57:13 -08:00
Makefile
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00