David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-11-25 12:49:17 -05:00

..

accessibility

…

acpi

ACPI video: Ignore errors after _DOD evaluation.

2012-11-03 09:52:54 +08:00

amba

…

ata

SCSI fixes on 20121122

2012-11-22 09:14:54 -10:00

atm

…

auxdisplay

…

base

PM / QoS: fix wrong error-checking condition

2012-11-23 20:55:06 +01:00

bcma

bcma: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP

2012-10-29 15:19:31 -04:00

block

mtip32xx: Fix padding issue

2012-11-23 14:32:55 +01:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-17 22:00:43 -05:00

bus

drivers: bus: ocp2scp: add pdata support

2012-11-07 09:35:53 -08:00

cdrom

…

char

sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP

2012-10-25 12:05:50 -07:00

clk

clk: ux500: Register slimbus clock lookups for u8500

2012-11-12 10:20:23 -08:00

clocksource

…

connector

…

cpufreq

cpufreq / powernow-k8: Change maintainer's email address

2012-10-31 21:02:57 +01:00

cpuidle

ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug

2012-10-08 22:52:54 -04:00

crypto

…

dca

…

devfreq

…

dio

…

dma

ioat: Do not enable DCA if tag map is invalid

2012-11-15 05:20:01 -08:00

edac

EDAC: Change Boris' email address

2012-10-30 10:05:51 +01:00

eisa

…

extcon

extcon : register for cable interest by cable name

2012-10-23 16:32:18 +09:00

firewire

[SCSI] sd: Implement support for WRITE SAME

2012-11-13 22:45:42 -08:00

firmware

firmware/memmap: avoid type conflicts with the generic memmap_init()

2012-10-19 14:07:47 -07:00

gpio

gpio-mcp23s08: Build I2C support even when CONFIG_I2C=m

2012-11-17 22:22:24 +01:00

gpu

Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

2012-11-22 13:21:57 +10:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2012-11-16 07:58:20 -08:00

hsi

…

hv

Drivers: hv: Cleanup error handling in vmbus_open()

2012-10-24 15:46:27 -07:00

hwmon

hwmon: Fix chip feature table headers

2012-11-05 21:54:40 +01:00

hwspinlock

…

i2c

Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux

2012-11-23 11:59:26 -10:00

ide

…

idle

…

iio

iio: Remove duplicates for light/ in Kconfig and Makefile

2012-10-19 19:44:06 +01:00

infiniband

Merge branches 'cxgb4' and 'mlx4' into for-next

2012-10-23 09:03:49 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2012-11-22 21:45:34 -10:00

iommu

intel-iommu: Fix lookup in add device

2012-11-17 13:27:15 +01:00

irqchip

irqchip: irq-bcm2835: Add terminating entry for of_device_id table

2012-11-06 07:37:10 -08:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-10 18:32:51 -05:00

leds

ledtrig-cpu: kill useless mutex to fix sleep in atomic context

2012-11-11 12:09:43 -08:00

lguest

…

macintosh

…

md

Several bug fixes for md in 3.7

2012-11-23 12:11:13 -10:00

media

[media] Kconfig: Fix dependencies for driver autoselect options

2012-10-17 16:45:56 -03:00

memory

…

memstick

…

message

…

mfd

…

misc

pwm: Changes for v3.7-rc1

2012-10-10 20:15:24 +09:00

mmc

mmc: sdhci-s3c: fix the card detection in runtime-pm

2012-11-07 15:40:52 -05:00

mtd

Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

2012-11-21 10:38:13 +00:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-25 12:49:17 -05:00

nfc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-25 12:49:17 -05:00

nubus

…

of

of/platform: sparse fix

2012-10-17 15:53:03 -05:00

oprofile

mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file

2012-10-09 16:22:18 +09:00

parisc

…

parport

Xtensa patchset for 3.7

2012-10-09 16:11:46 +09:00

pci

PCI/portdrv: Don't create hotplug slots unless port supports hotplug

2012-11-05 16:59:59 -07:00

pcmcia

Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes

2012-10-19 15:40:18 -07:00

pinctrl

pinctrl/samsung: don't allow enabling pinctrl-samsung standalone

2012-11-15 11:58:24 +01:00

platform

Merge branches 'fixes-for-37', 'ec' and 'thermal' into release

2012-10-09 01:47:35 -04:00

pnp

…

power

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-10-13 11:27:59 +09:00

pps

pps, ptp: Remove dependencies on EXPERIMENTAL

2012-11-01 11:35:17 -04:00

ps3

…

ptp

pch_gbe, ptp_pch: Fix the dependency direction between these drivers

2012-11-17 22:11:45 -05:00

pwm

pwm: Changes for v3.7-rc1

2012-10-10 20:15:24 +09:00

rapidio

rapidio: fix kernel-doc warnings

2012-11-16 14:33:04 -08:00

regulator

Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and 'regulator/fix/supp-volt' into tmp

2012-11-15 11:16:02 +09:00

remoteproc

…

rpmsg

…

rtc

drivers/rtc/rtc-imxdi.c: add missing spin lock initialization

2012-10-25 14:37:53 -07:00

s390

qeth: Remove BUG_ONs

2012-11-19 14:19:00 -05:00

sbus

…

scsi

[SCSI] sd: Implement support for WRITE SAME

2012-11-13 22:45:42 -08:00

sfi

…

sh

sh: Fix up more fallout from pointless ARM __iomem churn.

2012-10-15 14:08:48 +09:00

sn

…

spi

spi: Some minor MXS fixes

2012-10-28 11:13:54 -07:00

ssb

ssb: handle BCM43222 in pmu code.

2012-10-29 15:30:37 -04:00

staging

Revert "Staging: Android alarm: IOCTL command encoding fix"

2012-11-13 13:04:43 -08:00

target

target: Fix incorrect usage of nested IRQ spinlocks in ABORT_TASK path

2012-11-01 00:38:45 -07:00

tc

…

thermal

exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.

2012-11-03 09:52:55 +08:00

tty

tty: serial: max310x: Add terminating entry for spi_device_id table

2012-11-14 14:49:42 -08:00

uio

mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

2012-10-09 16:22:19 +09:00

usb

SCSI fixes on 20121122

2012-11-22 09:14:54 -10:00

uwb

…

vfio

vfio: Fix PCI INTx disable consistency

2012-10-10 09:10:32 -06:00

vhost

vhost: Remove duplicate inclusion of linux/vhost.h

2012-11-19 14:51:40 -05:00

video

omapdss fixes for 3.7-rc

2012-11-23 12:01:02 -10:00

virt

…

virtio

virtio: Don't access index after unregister.

2012-11-09 14:54:24 +10:30

vlynq

…

vme

…

w1

…

watchdog

…

xen

Bug-fix:

2012-11-20 18:52:01 -10:00

zorro

…

Kconfig

…

Makefile

IPMI: Change link order

2012-10-16 18:07:12 -07:00