Linus Torvalds
f6d43b93bd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
...
Pull security subsystem fixes from James Morris:
"From Mimi:
Both of these patches are bug fixes for patches, which were
upstreamed in this open window. The first patch addresses a merge
issue. The second patch addresses a CONFIG_BLOCK dependency."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
block: fix part_pack_uuid() build error
ima: "remove enforce checking duplication" merge fix
2013-02-25 15:45:29 -08:00
..
acpi
Merge branch 'acpi-cleanup'
2013-02-15 13:58:30 +01:00
asm-generic
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-02-23 18:50:11 -08:00
clocksource
arm: arch_timer: add missing inline in stub function
2013-02-11 15:16:05 -08:00
crypto
drm
keys
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2013-02-25 15:45:29 -08:00
math-emu
media
[media] media: ov7670: Add possibility to disable pixclk during hblank
2013-02-08 14:35:06 -02:00
memory
misc
net
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
pcmcia
ras
rdma
rxrpc
scsi
[SCSI] remove can_power_off flag from scsi_device
2013-01-25 15:36:50 -05:00
sound
ASoC: Final updates for v3.9
2013-02-16 15:48:48 +01:00
target
trace
Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-02-24 13:07:18 -08:00
uapi
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-02-24 17:35:10 -08:00
video
video: s3c-fb: fix typo in definition of VIDCON1_VSTATUS_FRONTPORCH value
2013-02-21 17:22:18 -08:00
xen
xen: event channel arrays are xen_ulong_t and not unsigned long
2013-02-20 08:45:07 -05:00
Kbuild