James Morris 2c9e703c61 Merge branch 'master' into next ... Conflicts: fs/exec.c Removed IMA changes (the IMA checks are now performed via may_open()). Signed-off-by: James Morris <jmorris@namei.org>		2009-05-22 18:40:59 +10: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: fix local_add_unless macro	2009-05-18 08:34:08 -07:00
crypto
drm	drm/i915: Add new GET_PIPE_FROM_CRTC_ID ioctl.	2009-05-14 16:00:32 -07:00
keys
linux	Merge branch 'master' into next	2009-05-22 18:40:59 +10:00
math-emu
media	V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.	2009-04-06 21:44:28 -03:00
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	PM/Hibernate: Wait for SCSI devices scan to complete during resume	2009-04-13 11:37:07 -07:00
sound	ALSA: Release v1.0.20	2009-05-06 12:32:26 +02:00
trace	tracing/syscalls: use a dedicated file header	2009-04-09 05:43:32 +02:00
video	include/video/cyblafb.h: remove it, it's unused	2009-04-13 15:04:30 -07:00
xen
Kbuild