Mark Brown 169d5a83f6 ASoC: Fix mismerge with release branch ...

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2011-06-14 09:51:50 +01:00

..

acpi

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release

2011-05-29 04:38:48 -04:00

asm-generic

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-05-28 10:56:34 -07:00

crypto

…

drm

…

keys

…

linux

Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd

2011-05-29 14:10:13 -07:00

math-emu

…

media

…

mtd

…

net

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

2011-05-27 11:16:27 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

…

sound

ASoC: Fix mismerge with release branch

2011-06-14 09:51:50 +01:00

staging

…

target

…

trace

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-05-28 12:55:55 -07:00

video

…

xen

…

Kbuild

…