]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12' into for-next
authorTejun Heo <tj@kernel.org>
Fri, 2 Aug 2013 20:16:18 +0000 (16:16 -0400)
committerTejun Heo <tj@kernel.org>
Fri, 2 Aug 2013 20:16:18 +0000 (16:16 -0400)

Trivial merge