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)
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>
1  2 
Documentation/kernel-parameters.txt
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/radeon/radeon_irq_kms.c
fs/f2fs/super.c

Simple merge
Simple merge
diff --cc fs/f2fs/super.c
Simple merge