Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2009-06-12 11:32:58 +02:00
..
acpi	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-04-28 17:21:20 -07:00
asm-generic	asm-generic: merge branch 'master' of torvalds/linux-2.6	2009-06-12 11:32:58 +02:00
crypto
drm	drm: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms.	2009-06-04 09:32:12 +10:00
keys
linux	fs/qnx4: sanitize includes	2009-06-11 21:36:12 -04:00
math-emu
media
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-05 08:26:10 -07:00
pcmcia
rdma
rxrpc
scsi	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
sound	ALSA: Release v1.0.20	2009-05-06 12:32:26 +02:00
trace	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
video	include/video/cyblafb.h: remove it, it's unused	2009-04-13 15:04:30 -07:00
xen
Kbuild