iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-30 03:55:20 -04:00
..
accessibility
…
acpi
PCI updates for v3.9:
2013-04-05 19:29:36 -07: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
[libata] Fix HDIO_DRIVE_* ioctl() Linux 3.9 regression
2013-04-03 19:48:49 -04:00
atm
atm: he: use mdelay instead of large udelay constants
2013-04-29 13:26:48 -04:00
auxdisplay
…
base
regmap: Back out work buffer fix
2013-04-09 18:03:25 +01:00
bcma
bcma: export some gpio functions
2013-03-27 13:39:09 -04:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2013-04-17 12:52:02 -07:00
bluetooth
Bluetooth: btmrvl: report error if verify_fw_download times out
2013-04-23 20:55:55 -03:00
bus
…
cdrom
…
char
vm: convert HPET mmap to vm_iomap_memory() helper
2013-04-19 09:46:39 -07:00
clk
clk: tegra: Allow PLLE training to succeed
2013-04-01 11:44:38 -07:00
clocksource
ImgTec Meta architecture changes for v3.9-rc1
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 / intel_pstate: Set timer timeout correctly
2013-04-08 22:09:23 +02:00
cpuidle
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
crypto
crypto: ux500 - add missing comma
2013-04-05 21:02:17 +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-22 20:32:51 -04:00
edac
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
eisa
EISA/PCI: Init EISA early, before PNP
2013-04-01 12:02:05 -06:00
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
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
gpio
gpio: pca953x: fix irq_domain_add_simple usage
2013-04-11 19:01:19 +02:00
gpu
drm/fb-helper: Fix locking in drm_fb_helper_hotplug_event
2013-04-12 14:21:12 +10:00
hid
HID: magicmouse: fix race between input_register() and probe()
2013-04-04 09:49:56 +02: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
hwspinlock: fix __hwspin_lock_request error path
2013-04-05 17:45:11 +03:00
i2c
ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
2013-04-02 15:30:41 +02: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
intel_idle: additional Haswell CPU-id
2013-03-15 10:55:31 -04:00
iio
First round of iio fixes post the 3.9 merge window.
2013-03-06 05:48:24 +08:00
infiniband
net/mlx4_en: Add HW timestamping (TS) support
2013-04-24 16:30:14 -04:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-04-19 09:15:13 -07:00
iommu
IOMMU fixes for Linux v3.9-rc4
2013-03-27 09:25:11 -07:00
ipack
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
irqchip
irqchip: gic: fix irq_trigger return
2013-03-26 20:52:25 +01:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-30 03:55:20 -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
All trivial, thanks to the stuff which didn't quite make it time.
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
Revert "block: add missing block_bio_complete() tracepoint"
2013-04-18 09:00:26 -07:00
media
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-07 18:37:01 -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
misc/vmw_vmci: Add dependency on CONFIG_NET
2013-04-03 11:53:39 -07:00
mmc
Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus
2013-03-03 00:32:50 +00:00
mtd
mtdchar: remove no-longer-used vma helpers
2013-04-19 10:05:39 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-30 03:55:20 -04:00
nfc
NFC: pn544: Add MEI physical layer
2013-04-16 00:39:41 +02:00
ntb
…
nubus
…
of
net: of_mdio: scan mdiobus for PHYs without reg property
2013-04-08 16:55:26 -04: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: Add SRIOV helper function to determine if VFs are assigned to guest
2013-04-24 19:31:58 -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
Here are a few pinctrl fixes for the v3.9 rc series:
2013-03-24 10:11:29 -07:00
platform
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
2013-04-18 15:14:34 -07: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: dynamic allocation of PHC char devices
2013-04-12 18:22:45 -04:00
pwm
pwm: Changes for v3.9-rc1
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: fix FW_CONFIG typo
2013-04-07 15:11:27 +03:00
rpmsg
rpmsg: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
rtc
Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR"
2013-04-05 09:36:53 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-22 20:32:51 -04:00
sbus
bbc_i2c: fix section mismatch warning
2013-03-31 19:29:12 -04:00
scsi
bnx2x, bnx2fc: Use per port max exchange resources
2013-04-25 04:06:46 -04:00
sfi
…
sh
…
sn
…
spi
spi: Fixes for v3.9
2013-04-05 10:04:41 -07:00
ssb
ssb: implement ssb spuravoid for chipid BCM43222
2013-04-26 08:42:22 -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 incorrect fallthrough of ALUA Standby/Offline/Transition CDBs
2013-04-11 01:48:49 -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
tty: mxser: fix cycle termination condition in mxser_probe() and mxser_module_init()
2013-04-08 11:30:04 -07:00
uio
uio: convert to idr_alloc()
2013-02-27 19:10:19 -08:00
usb
USB / PM: Don't try to hide PM QoS flags from usb_port_device_release()
2013-04-02 01:25:09 +02:00
uwb
driver-core: constify data for class_find_device()
2013-02-06 12:18:56 -08:00
vfio
vfio-pci: Fix possible integer overflow
2013-03-26 11:33:16 -06:00
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-22 20:32:51 -04:00
video
vm: convert fb_mmap to vm_iomap_memory() helper
2013-04-19 09:57:35 -07:00
virt
…
virtio
All trivial, thanks to the stuff which didn't quite make it time.
2013-02-26 14:49:12 -08:00
vlynq
…
vme
vme: add missing put_device() after device_register() fails
2013-02-14 09:24:14 -08:00
w1
w1: fix oops when w1_search is called from netlink connector
2013-03-12 16:20:46 -07:00
watchdog
watchdog: Revert the AT91RM9200_WATCHDOG dependency
2013-04-14 09:09:10 +02:00
xen
Bug-fixes:
2013-04-10 15:57:33 -07:00
zorro
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
Kconfig
Char/Misc driver patches for 3.9-rc1
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