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

…

crypto

…

drm

…

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

…

rxrpc

…

scsi

…

sound

…

trace

…

video

…

xen

xen: Provide a variant of __RING_SIZE() that is an integer constant expression

2010-12-15 12:34:28 -08:00

Kbuild

…