Russell King 404a02cbd2 Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h		2011-01-06 22:33:32 +00:00
..
acpi	ACPI: video: fix build for CONFIG_ACPI=n	2010-12-11 02:01:46 -05:00
asm-generic	asm-generic/stat.h: support 64-bit file time_t for stat()	2010-11-01 15:31:29 -04:00
crypto
drm	drm/i915: announce to userspace that the bsd ring is coherent	2010-12-05 10:40:39 +00:00
keys
linux	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
math-emu
media	[media] wm8775: Revert changeset fcb9757333 to avoid a regression	2011-01-03 09:09:56 -02:00
mtd
net	Revert "ipv4: Allow configuring subnets as local addresses"	2010-12-23 12:03:57 -08:00
pcmcia
rdma	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
rxrpc
scsi	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
sound	ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI	2010-11-24 15:29:56 +09:00
trace	ext4: Add new ext4 inode tracepoints	2010-11-08 13:51:33 -05:00
video	fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define	2010-11-16 10:14:22 +09:00
xen	xen: Provide a variant of __RING_SIZE() that is an integer constant expression	2010-12-15 12:34:28 -08:00
Kbuild