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	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-05-24 12:06:40 -07:00
keys	libceph: Create a new key type "ceph".	2011-03-29 12:11:24 -07:00
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	[media] Add missing include guard to header file	2011-05-25 21:42:30 -03:00
mtd	UBI: fix minor stylistic issues	2011-04-14 11:34:41 +03:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-27 11:16:27 -07:00
pcmcia	pcmcia: Make declaration and uses of struct pcmcia_device_id const	2011-05-06 07:46:15 +02:00
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-05-26 12:13:57 -07:00
rxrpc	Fix common misspellings	2011-03-31 11:26:23 -03:00
scsi	[SCSI] libsas: Add option for SATA soft reset	2011-05-26 22:49:33 -05:00
sound	ASoC: Fix mismerge with release branch	2011-06-14 09:51:50 +01:00
staging	[media] Altera FPGA firmware download module	2011-03-21 20:32:16 -03:00
target	[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun	2011-05-24 13:02:42 -04:00
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	Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-24 15:49:57 +09:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem	2011-05-26 10:50:56 -07:00
Kbuild