]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14' into for-next
authorTejun Heo <tj@kernel.org>
Fri, 29 Nov 2013 15:43:09 +0000 (10:43 -0500)
committerTejun Heo <tj@kernel.org>
Fri, 29 Nov 2013 15:43:09 +0000 (10:43 -0500)

Trivial merge