]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.15' into for-next
authorMike Snitzer <snitzer@redhat.com>
Tue, 15 Apr 2014 16:36:42 +0000 (12:36 -0400)
committerMike Snitzer <snitzer@redhat.com>
Tue, 15 Apr 2014 16:36:42 +0000 (12:36 -0400)

Trivial merge