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

Trivial merge