From: Tejun Heo <tj@kernel.org>
Date: Tue, 12 Mar 2013 18:38:12 +0000 (-0700)
Subject: Merge branch 'for-3.10' into for-next
X-Git-Tag: next-20130320~29^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=613b72149de604b2c8dfb401d30c6e2a559d5704;p=karo-tx-linux.git

Merge branch 'for-3.10' into for-next

Conflicts:
	kernel/workqueue.c
---

613b72149de604b2c8dfb401d30c6e2a559d5704