Mark Brown 18d4ed4342 Merge branch 'for-3.1' into for-3.2 ... Conflict due to the fix for the register map failure - taken the for-3.1 version. Conflicts: sound/soc/codecs/sgtl5000.c		2011-08-08 14:56:19 +09:00
..
acpi	Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-08-03 21:53:27 -10:00
asm-generic	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
crypto
drm	drm: Separate EDID Header Check from EDID Block Check	2011-08-04 14:39:35 +01:00
keys
linux	Merge branch 'for-3.1' into for-3.2	2011-08-08 14:56:19 +09:00
math-emu
media	[media] V4L: initial driver for ov5642 CMOS sensor	2011-07-27 17:56:09 -03:00
mtd
net	net: Compute protocol sequence numbers and fragment IDs using MD5.	2011-08-06 18:33:19 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-07-31 06:23:08 -10:00
rdma	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
rxrpc	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
scsi	Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd	2011-08-06 22:56:03 -07:00
sound	Merge branch 'for-3.1' into for-3.2	2011-08-08 14:56:19 +09:00
target	target: Bump version to v4.1.0-rc1-ml	2011-07-22 09:37:49 +00:00
trace	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2011-08-01 13:56:03 -10:00
video	OMAP: DSS2: Remove unused opt_clock_available	2011-07-25 10:22:05 +03:00
xen	xen/balloon: memory hotplug support for Xen balloon driver	2011-07-25 20:57:08 -07:00
Kbuild