]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'workqueues/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 05:07:13 +0000 (15:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 05:07:13 +0000 (15:07 +1000)
commitd99d89b87675c7b875b8624f59c65aed616a1b0e
tree68a269c161370979efd0ca6cbd5de19b474ac9e5
parent8713bf9372569fb5f3fd65d02e2d1bad292f476e
parent4ed8a5d86d7889d24b25b9230e1768b6251c60b6
Merge remote-tracking branch 'workqueues/for-next'

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