Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-07 09:03:39 -07:00

..

android

Staging tree fixes for 3.4-rc2

2012-04-12 15:35:12 -07:00

asus_oled

USB: asus_oled.c: remove err() usage

2012-04-20 16:53:17 -07:00

bcm

Staging: bcm: fix possible memory leak of 'pstAddIndication' in CmHost.c and removes a whitespace

2012-03-02 16:36:55 -08:00

comedi

USB: vmk80xx.c: remove err() usage

2012-04-20 16:53:22 -07:00

cptm1217

…

crystalhd

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

cxt1e1

…

echo

…

et131x

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

frontier

USB: tranzport.c: remove err() usage

2012-04-20 16:53:27 -07:00

ft1000

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

iio

staging: iio: hmc5843: Fix crash in probe function.

2012-04-12 14:34:31 -07:00

keucr

USB merge for 3.4-rc1

2012-03-20 11:26:30 -07:00

line6

USB: toneport.c: remove err() usage

2012-04-20 16:53:32 -07:00

media

USB: remove CONFIG_USB_DEVICEFS

2012-04-29 22:20:03 -04:00

mei

watchdog: fix set_timeout operations

2012-03-27 20:08:09 +02:00

nvec

…

octeon

staging: octeon-ethernet: fix build errors by including interrupt.h

2012-04-24 11:57:37 -07:00

olpc_dcon

…

omapdrm

staging: drm/omap: move where DMM driver is registered

2012-04-10 09:19:29 -07:00

ozwpan

staging: ozwpan: Fix bug where kfree is called twice.

2012-04-26 12:40:53 -07:00

panel

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

phison

…

quatech_usb2

USB: quatech_usb2.c: remove dbg() tracing calls

2012-05-04 16:17:49 -07:00

quickstart

…

ramster

staging: ramster: unbreak my heart

2012-04-10 09:16:19 -07:00

rtl8187se

usermodehelper: use UMH_WAIT_PROC consistently

2012-03-23 16:58:41 -07:00

rtl8192e

usermodehelper: use UMH_WAIT_PROC consistently

2012-03-23 16:58:41 -07:00

rtl8192u

Merge branch 'kmap_atomic' of git://github.com/congwang/linux

2012-03-21 09:40:26 -07:00

rtl8712

staging: r8712u: Fix Smatch warning

2012-03-07 13:36:45 -08:00

rts5139

staging: Update TODO for rts5139 and rts_pstor

2012-02-24 12:03:14 -08:00

rts_pstor

Staging: rts_pstor: off by one in for loop

2012-04-10 09:18:59 -07:00

sbe-2t3e3

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

sep

staging: sep: Fix sign of error

2012-04-10 09:14:39 -07:00

serial

…

serqt_usb2

USB: serqt_usb2.c: remove dbg() tracing calls

2012-05-04 16:17:51 -07:00

slicoss

staging: clean up Greg's email address in some TODO files

2012-02-15 14:45:40 -08:00

sm7xx

includecheck: delete any duplicate instances of module.h

2012-02-28 19:31:56 -05:00

speakup

TTY: speakup, do not use serialP

2012-03-08 11:47:02 -08:00

ste_rmi4

ARM: More device tree support updates

2012-03-28 12:34:33 -07:00

telephony

Disintegrate and delete asm/system.h

2012-03-28 15:58:21 -07:00

tidspbridge

staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS

2012-04-24 11:57:36 -07:00

usbip

Staging: usbip: Remove commented code.

2012-02-24 11:59:57 -08:00

vme

staging/vme: Fix module parameters

2012-04-10 09:14:39 -07:00

vt6655

Staging: vt6655-6: check keysize before memcpy()

2012-04-10 09:17:34 -07:00

vt6656

staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()

2012-04-12 14:34:31 -07:00

winbond

…

wlags49_h2

Disintegrate and delete asm/system.h

2012-03-28 15:58:21 -07:00

wlags49_h25

…

wlan-ng

Staging: wlan-ng: still setting wrong data

2012-02-29 15:55:52 -08:00

xgifb

staging/xgifb: fix display on XGI Volari Z11m cards

2012-04-10 09:51:49 -07:00

zcache

staging: zcache: fix Kconfig crypto dependency

2012-04-24 11:57:36 -07:00

zram

Merge branch 'kmap_atomic' of git://github.com/congwang/linux

2012-03-21 09:40:26 -07:00

zsmalloc

staging: zsmalloc: fix memory leak

2012-04-10 09:18:59 -07:00

Kconfig

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

2012-03-22 13:27:02 -07:00

Makefile

staging: ozwpan: Plumbed in Kconfig and Kbuild

2012-02-24 09:29:24 -08:00

staging.c

…