Paul Moore 98f700f317 Merge git://git.infradead.org/users/eparis/selinux ... Conflicts: security/selinux/hooks.c Pull Eric's existing SELinux tree as there are a number of patches in there that are not yet upstream. There was some minor fixup needed to resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts() between the labeled NFS patches and Eric's security_fs_use() simplification patch.		2013-09-18 13:52:20 -04:00
..
acpi	ACPI: Try harder to resolve _ADR collisions for bridges	2013-08-07 22:55:00 +02:00
asm-generic	Fix TLB gather virtual address range invalidation corner cases	2013-08-16 08:52:46 -07:00
clocksource
crypto
drm	drm: fix 64 bit drm fixed point helpers	2013-07-30 17:24:13 -04:00
dt-bindings	Pin control fixes for the v3.11 series:	2013-07-28 18:19:27 -07:00
keys
kvm	ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq	2013-06-26 10:50:02 -07:00
linux	Merge git://git.infradead.org/users/eparis/selinux	2013-09-18 13:52:20 -04:00
math-emu
media	[media] v4l2: added missing mutex.h include to v4l2-ctrls.h	2013-07-26 10:14:52 -03:00
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2013-08-29 16:05:30 -04:00
pcmcia
ras
rdma	Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next	2013-07-08 11:22:11 -07:00
rxrpc
scsi	[SCSI] libiscsi: Added new boot entries in the session sysfs	2013-06-26 18:04:11 -07:00
sound	ASoC: More updates for v3.11	2013-06-28 13:36:22 +02:00
target	target: make queue_tm_rsp() return void	2013-07-07 18:36:53 -07:00
trace	This contains fixes, optimizations and some clean ups	2013-07-22 19:07:24 -07:00
uapi	Omnikey Cardman 4000: pull in ioctl.h in user header	2013-08-28 19:26:38 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
xen	Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block	2013-07-22 19:02:52 -07:00
Kbuild