iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/netconsole.c
	net/bridge/br_private.h

Three mostly trivial conflicts.

The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.

In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".

Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-11-04 13:48:30 -05:00
..
accessibility
…
acpi
ACPI / PM: Drop two functions that are not used any more
2013-10-17 15:44:48 +02:00
amba
…
ata
Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2013-10-22 08:21:34 +01:00
atm
atm: firestream: remove duplicate define
2013-10-21 18:46:46 -04:00
auxdisplay
…
base
driver core: Release device_hotplug_lock when store_mem_state returns EINVAL
2013-10-16 18:42:41 -07:00
bcma
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-10-17 14:02:07 -04:00
block
cciss: fix info leak in cciss_ioctl32_passthru()
2013-09-24 17:00:26 -07:00
bluetooth
Bluetooth: btmrvl: add calibration data download support
2013-10-02 00:36:16 -07:00
bus
bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties
2013-10-01 17:04:17 +00:00
cdrom
…
char
A small fix for Xen on x86_32 and a build fix for xen-tpmfront on arm64.
2013-10-15 16:22:11 -07:00
clk
clk: fixup argument order when setting VCO parameters
2013-10-07 23:01:07 -07:00
clocksource
clocksource: em_sti: Set cpu_possible_mask to fix SMP broadcast
2013-09-26 02:31:04 +02:00
connector
connector: use 'size' everywhere in cn_netlink_send()
2013-10-02 16:03:50 -04:00
cpufreq
acpi-cpufreq: Fail initialization if driver cannot be registered
2013-10-25 16:22:47 +02:00
cpuidle
ACPI and power management fixes for 3.12-rc1
2013-09-12 11:22:45 -07:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
2013-09-07 12:53:35 +10:00
dca
…
devfreq
…
dio
…
dma
dmaengine: edma: fix another memory leak
2013-10-24 22:17:50 +05:30
edac
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2013-09-06 11:14:33 -07:00
eisa
…
extcon
Driver core patches for 3.12-rc1
2013-09-03 11:37:15 -07:00
firewire
firewire: ohci: Fix deadlock at bus reset
2013-08-29 22:35:05 +02:00
firmware
firmware/dmi_scan: drop OOM messages
2013-09-11 15:58:51 -07:00
fmc
…
gpio
gpiolib: let gpiod_request() return -EPROBE_DEFER
2013-10-11 16:31:54 +02:00
gpu
i915: fix compiler warning
2013-10-31 15:28:23 -07:00
hid
HID: wiimote: add LEGO-wiimote VID
2013-10-21 13:39:37 +02:00
hsi
…
hv
Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code"
2013-10-17 09:30:10 -07:00
hwmon
hwmon: (applesmc) Always read until end of data
2013-10-09 09:48:55 -07:00
hwspinlock
…
i2c
i2c: i2c-mux-pinctrl: use deferred probe when adapter not found
2013-10-10 10:22:35 +02:00
ide
ide: sgiioc4: Staticize ioc4_ide_attach_one()
2013-09-05 15:21:30 -04:00
idle
…
iio
iio:buffer: Free active scan mask in iio_disable_all_buffers()
2013-10-15 19:26:43 +01:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-11-04 13:48:30 -05:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-10-31 10:38:59 -07:00
iommu
x86, build, pci: Fix PCI_MSI build on !SMP
2013-10-04 10:43:34 -07:00
ipack
…
irqchip
ARM: SoC late changes for v3.12
2013-09-09 16:35:29 -07:00
isdn
isdn: remove deprecated IRQF_DISABLED
2013-10-17 15:13:20 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-09-12 11:35:33 -07:00
lguest
lguest: fix guest kernel stack overflow when TF bit set.
2013-09-06 08:09:27 +09:30
macintosh
…
mailbox
mailbox: remove unnecessary platform_set_drvdata()
2013-09-18 12:02:00 -07:00
md
raid5: avoid finding "discard" stripe
2013-10-24 13:00:24 +11:00
media
[media] saa7134: Fix crash when device is closed before streamoff
2013-10-14 06:37:00 -03:00
memory
ARM: SoC platform changes for 3.12
2013-09-06 13:30:06 -07:00
memstick
memstick: add support for legacy memorysticks
2013-09-11 15:59:35 -07:00
message
…
mfd
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
misc
mei: cancel stall timers in mei_reset
2013-09-26 13:56:53 -07:00
mmc
ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format
2013-09-21 09:55:32 -07:00
mtd
mtd: gpmi: fix ECC regression
2013-10-25 10:09:43 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-11-04 13:48:30 -05:00
nfc
…
ntb
ntb: clean up unnecessary MSI/MSI-X capability find
2013-09-05 11:08:01 -07:00
nubus
…
of
Revert "drivers: of: add initialization code for dma reserved memory"
2013-10-15 09:26:07 +01:00
oprofile
oprofile: get rid of pointless forward declarations of struct super_block
2013-09-03 22:52:48 -04:00
parisc
PCI changes for the v3.12 merge window:
2013-09-03 16:24:35 -07:00
parport
drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
2013-08-30 12:08:04 -07:00
pci
Revert "ACPI / hotplug / PCI: Avoid doing too much for spurious notifies"
2013-10-30 15:28:52 +01:00
pcmcia
…
pinctrl
pinctrl: palmas: do not abort pin configuration for BIAS_DEFAULT
2013-09-27 16:22:43 +02:00
platform
platform/x86: fix asus-wmi build error
2013-10-23 07:57:57 +01:00
pnp
pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified
2013-09-11 15:58:15 -07:00
power
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
pps
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
ps3
…
ptp
…
pwm
ARM: SoC cleanups for 3.12
2013-09-06 13:21:16 -07:00
rapidio
…
regulator
Merge remote-tracking branch 'regulator/fix/wm8350' into regulator-linus
2013-09-30 12:04:33 +01:00
remoteproc
…
reset
…
rpmsg
…
rtc
rtc: simplify devm_request_mem_region/devm_ioremap
2013-09-11 15:58:59 -07:00
s390
s390/time: correct use of store clock fast
2013-10-22 09:16:40 +02:00
sbus
…
scsi
aacraid: missing capable() check in compat ioctl
2013-10-30 12:24:49 -07:00
sfi
…
sh
…
sn
…
spi
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
2013-10-07 14:51:59 +01:00
ssb
…
staging
Staging: sb105x: info leak in mp_get_count()
2013-10-30 12:24:50 -07:00
target
target/pscsi: fix return value check
2013-10-25 10:42:09 -07:00
tc
…
thermal
Merge branch 'x86_pkg_temp' of .git into for-rc
2013-10-21 11:26:45 +08:00
tty
tty/serial: at91: fix uart/usart selection for older products
2013-10-17 13:27:24 -07:00
uio
Fix a few incorrectly checked [io_]remap_pfn_range() calls
2013-10-29 10:21:34 -07:00
usb
USB: serial: ftdi_sio: add id for Z3X Box device
2013-11-01 09:33:56 -07:00
uwb
…
vfio
VFIO: vfio_iommu_type1: fix bug caused by break in nested loop
2013-10-11 10:40:46 -06:00
vhost
vhost/scsi: Fix incorrect usage of get_user_pages_fast write parameter
2013-10-25 11:03:34 -07:00
video
Fix a few incorrectly checked [io_]remap_pfn_range() calls
2013-10-29 10:21:34 -07:00
virt
…
virtio
virtio_pci: pm: Use CONFIG_PM_SLEEP instead of CONFIG_PM
2013-09-09 10:02:53 +09:30
vlynq
…
vme
…
w1
w1 - call request_module with w1 master mutex unlocked
2013-10-07 00:12:14 -07:00
watchdog
watchdog: sunxi: Fix section mismatch
2013-10-13 20:02:03 +02:00
xen
Bug-fixes:
2013-09-25 15:50:53 -07:00
zorro
…
Kconfig
…
Makefile
…