]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'master' into for-next
authorTejun Heo <tj@kernel.org>
Wed, 20 Mar 2013 17:23:34 +0000 (10:23 -0700)
committerTejun Heo <tj@kernel.org>
Wed, 20 Mar 2013 17:23:34 +0000 (10:23 -0700)
commit30db5f11e7bcbad587dc759d5c93eb865f983379
treef902223cbcbe30d28d7a0ec71df1c30cc3869e28
parentc1b493f3330ec859ca513fb6e00e039af61365b2
parent112ccff716ae74ffa5f30266b29c4d72aab4074b
Merge branch 'master' into for-next

Conflicts:
kernel/workqueue.c
kernel/workqueue.c