]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.6' into for-next
authorTejun Heo <tj@kernel.org>
Tue, 17 Jul 2012 18:12:47 +0000 (11:12 -0700)
committerTejun Heo <tj@kernel.org>
Tue, 17 Jul 2012 18:12:47 +0000 (11:12 -0700)

Trivial merge