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

..

android

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

asus_oled

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

bcm

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

2013-02-26 20:16:07 -08:00

ccg

fs: Limit sys_mount to only request filesystem modules.

2013-03-03 19:36:31 -08:00

ced1401

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

comedi

staging: comedi: s626: fix continuous acquisition

2013-03-25 11:35:38 -07:00

cptm1217

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

crystalhd

staging: crystalhd: remove use of __devexit

2012-11-21 15:05:12 -08:00

csr

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

cxt1e1

staging: cxt1e1: buffer overflow in do_del_chan()

2013-01-25 11:21:26 -08:00

dgrp

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

2013-02-26 20:16:07 -08:00

echo

staging: echo.c: fix memory leakage

2013-01-07 14:03:32 -08:00

et131x

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

frontier

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

ft1000

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

fwserial

tty/serial patches for 3.9-rc1

2013-02-21 13:41:04 -08:00

gdm72xx

gdm72xx: replace obsolete NLMSG_* with type safe nlmsg_*

2013-03-28 14:25:49 -04:00

goldfish

staging/goldfish: Add MTD dependency to KCONFIG

2013-02-07 17:16:07 -08:00

iio

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

imx-drm

staging: imx/drm: request irq only after adding the crtc

2013-03-11 09:31:48 -07:00

keucr

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

line6

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

media

[media] staging: media: Remove unnecessary OOM messages

2013-02-13 17:32:46 -02:00

net

staging: net: remove use of __devexit

2012-11-21 15:05:02 -08:00

nvec

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

octeon

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

2013-02-21 17:40:58 -08:00

olpc_dcon

staging: olpc_dcon: remove use of __devexit_p

2012-11-21 15:05:00 -08:00

omap-thermal

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

ozwpan

staging/ozwpan: Mark read only parameters and structs as const

2013-02-15 15:14:30 -08:00

panel

staging/panel: Mark local functions/structs static and add const if applicable (fix sparse warnings)

2013-02-15 10:20:14 -08:00

phison

staging/phison: use module_pci_driver macro

2012-07-11 17:26:02 -07:00

quickstart

ACPI: Remove useless type argument of driver .remove() operation

2013-01-26 00:37:24 +01:00

rtl8187se

staging/rtl8187se: Mark functions as static to silence sparse

2013-02-15 10:28:37 -08:00

rtl8192e

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

2013-01-15 15:05:59 -05:00

rtl8192u

staging/rtl8192u/ieee80211: Fix buffer overflow in ieee80211_softmac_wx.c

2013-02-14 09:26:23 -08:00

rtl8712

rtl8712: remove unused definitions from ethernet.h

2013-01-11 16:39:12 -08:00

rts5139

staging: rts5139: fixed issues when config to built-in object

2012-10-22 15:58:22 -07:00

sb105x

tty/serial patches for 3.9-rc1

2013-02-21 13:41:04 -08:00

sbe-2t3e3

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

sep

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

serqt_usb2

TTY: switch tty_schedule_flip

2013-01-15 22:43:15 -08:00

silicom

Staging: silicom: bypasslib: remove unused including <linux/version.h>

2012-11-01 08:44:42 -07:00

slicoss

staging: slicoss: Fix space-related checkpatch.pl warnings

2013-01-17 13:53:06 -08:00

sm7xxfb

staging: sm7xxfb: remove use of __devexit

2012-11-21 15:05:12 -08:00

speakup

tty/serial patches for 3.9-rc1

2013-02-21 13:41:04 -08:00

ste_rmi4

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

tidspbridge

tidspbridge: convert to idr_alloc()

2013-03-13 15:21:47 -07:00

usbip

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

2013-02-26 20:16:07 -08:00

vme

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

2013-02-26 20:16:07 -08:00

vt6655

staging: vt6655: no braces needed for single statement if , for blocks

2013-01-17 13:17:03 -08:00

vt6656

staging/vt6656: Fix too large integer constant warning on 32-bit

2013-03-11 09:53:46 -07:00

winbond

staging: Add angle bracket before and after the URL

2013-01-07 14:56:04 -08:00

wlags49_h2

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

wlags49_h25

staging: "wlags49_h25" Fix typos.

2012-09-17 14:50:33 -07:00

wlan-ng

Staging tree update for 3.9-rc1

2013-02-21 12:11:44 -08:00

xgifb

staging/xgifb: Remove duplicated code in loops.

2013-02-15 15:12:40 -08:00

zcache

staging: zcache: fix typo "64_BIT"

2013-03-18 16:04:03 -07:00

zram

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

zsmalloc

mm: rename page struct field helpers

2013-02-23 17:50:18 -08:00

Kconfig

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2013-02-25 16:46:44 -08:00

Makefile

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2013-02-25 16:46:44 -08:00

staging.c

…