Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 08:09:22 +0000 (10:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 08:09:29 +0000 (10:09 +0200)
commit864bfb25b57a6766ea689befa5cf09a4353281ce
tree478941ca6e76b8d77b71f5827a3ce751c46a72b5
parent071361d3473ebb8142907470ff12d59c59f6be72
parent49717cb40410fe4b563968680ff7c513967504c6
Merge branch 'master' into for-next

Merge with 49717cb ("kthread: Document ways of reducing OS jitter due
to per-CPU kthreads") to be able to apply fixup patch on top of it.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Documentation/kernel-parameters.txt
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/radeon/radeon_irq_kms.c
fs/f2fs/super.c