Russell King b3773301c4 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable ... Conflicts: drivers/video/sh_mobile_hdmi.c		2010-10-28 20:14:38 +01:00
..
acpi	Merge branch 'misc' into release	2010-10-26 14:51:00 -04:00
asm-generic	vmlinux.lds.h: lower init ramfs alignment to 4	2010-10-26 16:52:13 -07:00
crypto
drm
keys
linux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-10-26 17:58:44 -07:00
math-emu
media
mtd
net
pcmcia
rdma
rxrpc
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
sound
trace	writeback: do not sleep on the congestion queue if there are no congested BDIs or if significant congestion is not being encountered in the current zone	2010-10-26 16:52:07 -07:00
video	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-10-28 20:14:38 +01:00
xen	Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2010-10-26 18:20:19 -07:00
Kbuild