]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12' into for-next
authorTejun Heo <tj@kernel.org>
Mon, 19 Aug 2013 13:57:10 +0000 (09:57 -0400)
committerTejun Heo <tj@kernel.org>
Mon, 19 Aug 2013 13:57:10 +0000 (09:57 -0400)

Trivial merge