Mark Brown d5381e42f6 ASoC: Merge branch 'for-2.6.39' into for-2.6.40 ...

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

2011-04-18 18:07:43 +01:00

..

altera-stapl

[media] staging: altera-jtag needs delay.h

2011-03-31 18:49:34 -03:00

asus_oled

…

ath6kl

Fix common misspellings

2011-03-31 11:26:23 -03:00

bcm

Fix common misspellings

2011-03-31 11:26:23 -03:00

brcm80211

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

comedi

Fix common misspellings

2011-03-31 11:26:23 -03:00

cptm1217

Fix common misspellings

2011-03-31 11:26:23 -03:00

crystalhd

Fix common misspellings

2011-03-31 11:26:23 -03:00

cs5535_gpio

staging: cs5535_gpio: check put_user() return code

2011-01-21 12:35:14 -08:00

cx25821

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

2011-03-24 09:50:13 -07:00

cxd2099

[media] ngene: Fix compilation when cxd2099 is not enabled

2011-03-21 20:31:48 -03:00

cxt1e1

Fix common misspellings

2011-03-31 11:26:23 -03:00

dt3155v4l

[media] V4L: remove V4L1 compatibility mode

2010-12-29 08:17:07 -02:00

easycap

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

2011-03-24 09:50:13 -07:00

echo

staging: echo: fix a typo ("overflow")

2011-03-02 16:03:59 -05:00

et131x

Fix common misspellings

2011-03-31 11:26:23 -03:00

frontier

…

ft1000

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

generic_serial

Fix common misspellings

2011-03-31 11:26:23 -03:00

gma500

Fix common misspellings

2011-03-31 11:26:23 -03:00

go7007

Fix common misspellings

2011-03-31 11:26:23 -03:00

hv

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

iio

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

intel_sst

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

keucr

Fix common misspellings

2011-03-31 11:26:23 -03:00

line6

staging: line6: Remove NULL check before kfree

2011-03-14 11:57:33 -07:00

lirc

Fix common misspellings

2011-03-31 11:26:23 -03:00

msm

Fix common misspellings

2011-03-31 11:26:23 -03:00

octeon

Fix common misspellings

2011-03-31 11:26:23 -03:00

olpc_dcon

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

panel

…

phison

…

pohmelfs

Fix common misspellings

2011-03-31 11:26:23 -03:00

quatech_usb2

Fix common misspellings

2011-03-31 11:26:23 -03:00

quickstart

Staging: quickstart: fixed coding style issues

2011-02-09 12:11:55 -08:00

rt2860

Fix common misspellings

2011-03-31 11:26:23 -03:00

rt2870

Fix common misspellings

2011-03-31 11:26:23 -03:00

rtl8187se

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

rtl8192e

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

rtl8192u

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

rtl8712

Fix common misspellings

2011-03-31 11:26:23 -03:00

rts_pstor

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

samsung-laptop

backlight: add backlight type

2011-03-22 17:43:59 -07:00

sbe-2t3e3

…

sep

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

serqt_usb2

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

2011-03-16 15:19:35 -07:00

slicoss

Fix common misspellings

2011-03-31 11:26:23 -03:00

sm7xx

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

solo6x10

staging: Solo6x10: Changed solo6010* -> solo*, solo6x10* etc.

2011-02-18 12:37:04 -08:00

speakup

Fix common misspellings

2011-03-31 11:26:23 -03:00

spectra

Fix common misspellings

2011-03-31 11:26:23 -03:00

ste_rmi4

Fix common misspellings

2011-03-31 11:26:23 -03:00

tidspbridge

Fix common misspellings

2011-03-31 11:26:23 -03:00

tm6000

Fix common misspellings

2011-03-31 11:26:23 -03:00

tty

Fix common misspellings

2011-03-31 11:26:23 -03:00

usbip

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

vme

Fix common misspellings

2011-03-31 11:26:23 -03:00

vt6655

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

vt6656

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

westbridge

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-04-07 11:36:44 -07:00

winbond

Fix common misspellings

2011-03-31 11:26:23 -03:00

wlags49_h2

Fix common misspellings

2011-03-31 11:26:23 -03:00

wlags49_h25

Fix common misspellings

2011-03-31 11:26:23 -03:00

wlan-ng

Fix common misspellings

2011-03-31 11:26:23 -03:00

xgifb

Fix common misspellings

2011-03-31 11:26:23 -03:00

zcache

staging: Allow sharing xvmalloc for zram and zcache

2011-02-23 14:02:56 -08:00

zram

staging: Allow sharing xvmalloc for zram and zcache

2011-02-23 14:02:56 -08:00

Kconfig

staging: memrar: remove driver from tree

2011-04-04 21:41:20 -07:00

Makefile

staging: memrar: remove driver from tree

2011-04-04 21:41:20 -07:00

staging.c

…