Merge branch 'hif' into next
authorOleksij Rempel <linux@rempel-privat.de>
Sun, 23 Mar 2014 06:34:40 +0000 (07:34 +0100)
committerOleksij Rempel <linux@rempel-privat.de>
Sun, 23 Mar 2014 06:34:40 +0000 (07:34 +0100)

Trivial merge