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

Conflicts:
	drivers/net/ethernet/broadcom/tg3.c

Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.

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

2012-03-01 17:57:40 -05:00

..

accessibility

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

acpi

ACPI: remove duplicated lines of merging problems with acpi_processor_add

2012-02-08 15:07:03 -08:00

amba

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

2012-01-08 13:10:57 -08:00

ata

pata/at91: use newly introduced SMC accessors

2012-02-13 18:31:37 +01:00

atm

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

2012-02-26 21:55:51 -05:00

auxdisplay

…

base

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

2012-02-18 15:37:25 -08:00

bcma

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2012-02-15 16:24:37 -05:00

block

asm-generic: architecture independent readq/writeq for 32bit environment

2012-02-21 16:47:28 -08:00

bluetooth

Bluetooth: btusb: Add vendor specific ID (0a5c 21f3) for BCM20702A0

2012-02-15 13:09:26 +02:00

cdrom

cdrom: move shared static to cdrom_device_info

2012-02-08 20:03:14 +01:00

char

agp: fix scratch page cleanup

2012-01-26 18:36:48 +00:00

clk

…

clocksource

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2012-01-06 18:15:25 -08:00

connector

…

cpufreq

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

2012-01-11 18:53:33 -08:00

cpuidle

cpuidle: Default y on powerpc pSeries

2012-02-22 16:48:51 +11:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-01-10 22:01:27 -08:00

dca

…

devfreq

…

dio

…

dma

i.MX SDMA: Fix burstsize settings

2012-02-02 14:00:43 +05:30

edac

asm-generic: architecture independent readq/writeq for 32bit environment

2012-02-21 16:47:28 -08:00

eisa

…

firewire

firewire: ohci: disable MSI on Ricoh controllers

2012-01-30 21:33:34 +01:00

firmware

Merge commit '070680218379e15c1901f4bf21b98e3cbf12b527' into stable/for-linus-fixes-3.3

2012-01-12 11:53:55 -05:00

gpio

gpio: Add missing spin_lock_init in gpio-ml-ioh driver

2012-02-01 21:59:37 -07:00

gpu

drm/radeon/kms/atom: dpms bios scratch reg updates

2012-02-22 10:30:06 +00:00

hid

HID: wiimote: fix invalid power_supply_powers call

2012-02-07 13:40:56 +01:00

hv

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2012-01-09 12:09:47 -08:00

hwmon

hwmon: (max34440) Fix resetting temperature history

2012-02-24 08:06:15 -08:00

hwspinlock

…

i2c

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes

2012-02-13 05:40:38 +00:00

ide

ARM: at91: drop ide driver in favor of the pata one

2012-02-13 18:31:37 +01:00

idle

ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores

2012-01-19 21:26:32 -05:00

ieee802154

…

infiniband

netlink: add netlink_dump_control structure for netlink_dump_start()

2012-02-26 14:10:06 -05:00

input

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

2012-02-04 10:57:42 -08:00

iommu

iommu/msm: Fix error handling in msm_iommu_unmap()

2012-01-30 12:53:14 +01:00

isdn

gigaset: Use semicolons to terminate statements

2012-02-27 14:12:07 -05:00

leds

drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax

2012-02-08 19:03:51 -08:00

lguest

lguest: Make sure interrupt is allocated ok by lguest_setup_irq

2012-01-12 15:44:47 +10:30

macintosh

powerpc/adb: Use set_current_state()

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

mca

…

md

Merge tag 'md-3.3-fixes' of git://neil.brown.name/md

2012-02-08 19:06:30 -08:00

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-02-24 12:32:51 -08:00

memstick

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

message

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2012-01-10 10:36:08 -08:00

mfd

Merge branch 'omap-fixes-warnings' of git://git.linaro.org/people/rmk/linux-arm

2012-02-13 14:16:07 -08:00

misc

Merge tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2012-02-09 13:51:13 -08:00

mmc

mmc: dw_mmc: Fix PIO mode with support of highmem

2012-02-13 20:39:05 -05:00

mtd

Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3

2012-02-04 07:17:47 -08:00

net

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

2012-03-01 17:57:40 -05:00

nfc

NFC: Free sk_buff if nfcwilink_send fails

2012-01-24 14:21:56 -05:00

nubus

…

of

Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

2012-01-14 13:25:55 -08:00

oprofile

…

parisc

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

parport

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

2012-01-14 12:32:16 -08:00

pci

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

2012-02-18 15:26:11 -08:00

pcmcia

pcmcia: fix socket refcount decrementing on each resume

2012-02-08 19:03:51 -08:00

pinctrl

pinctrl: restore pin naming

2012-02-01 19:35:21 +01:00

platform

asm-generic: architecture independent readq/writeq for 32bit environment

2012-02-21 16:47:28 -08:00

pnp

PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB

2012-01-06 12:11:20 -08:00

power

lp8727_charger: Add terminating entry for i2c_device_id table

2012-02-01 21:34:26 +04:00

pps

…

ps3

…

ptp

…

rapidio

…

regulator

regulator: Fix getting voltage in max8649_enable_time()

2012-02-10 11:20:55 +00:00

rtc

ARM: at91:rtc/rtc-at91sam9: ioremap register bank

2012-02-13 18:31:36 +01:00

s390

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

2012-02-26 21:55:51 -05:00

sbus

…

scsi

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

2012-02-26 21:55:51 -05:00

sfi

…

sh

sh: clkfwk: bugfix: use clk_reparent() for div6 clocks

2012-01-24 10:44:49 +09:00

sn

…

spi

spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver

2012-02-05 23:24:17 -07:00

ssb

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2012-02-15 16:24:37 -05:00

staging

Staging: wlags49_h2: print MAC via printk format specifier

2012-02-24 15:41:41 -05:00

target

target: Fix unsupported WRITE_SAME sense payload

2012-02-07 06:48:58 +00:00

tc

…

telephony

…

thermal

thermal: Rename generate_netlink_event

2012-01-23 03:15:25 -05:00

tty

tty: serial: omap-serial: wakeup latency constraint is in microseconds, not milliseconds

2012-02-09 10:48:36 -08:00

uio

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

usb

USB: Added Kamstrup VID/PIDs to cp210x serial driver.

2012-02-21 16:29:15 -08:00

uwb

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2012-01-09 12:09:47 -08:00

vhost

vhost-net: add module alias (v2.1)

2012-01-13 10:12:23 -08:00

video

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

2012-02-24 08:56:51 -08:00

virt

…

virtio

virtio: correct the memory barrier in virtqueue_kick_prepare()

2012-01-28 08:10:23 +10:30

vlynq

…

w1

…

watchdog

watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs

2012-01-27 10:01:16 +01:00

xen

xenbus_dev: add missing error check to watch handling

2012-02-03 16:07:05 -05:00

zorro

…

Kconfig

…

Makefile

mmc: sdhci-pci: add platform data

2012-01-11 23:58:47 -05:00