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

..

acpi

Fix common misspellings

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

asm-generic

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

crypto

crypto: padlock - Move padlock.h into include/crypto

2011-01-07 14:52:00 +11:00

drm

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

keys

libceph: Create a new key type "ceph".

2011-03-29 12:11:24 -07:00

linux

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

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

math-emu

…

media

Fix common misspellings

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

mtd

mtd: Define MLC Flash as a different flash type

2010-10-25 00:50:20 +01:00

net

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

2011-04-11 07:27:24 -07:00

pcmcia

pcmcia: re-enable Zoomed Video support

2011-02-20 12:47:34 +01:00

rdma

RDMA: Update workqueue usage

2011-01-16 21:16:31 -08:00

rxrpc

Fix common misspellings

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

scsi

Fix common misspellings

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

sound

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

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

staging

[media] Altera FPGA firmware download module

2011-03-21 20:32:16 -03:00

target

Fix common misspellings

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

trace

Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2011-03-28 15:31:05 -07:00

video

Fix common misspellings

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

xen

Fix common misspellings

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

Kbuild

…