Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorJames Morris <james.l.morris@oracle.com>
Sat, 26 Jul 2014 00:40:28 +0000 (10:40 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 26 Jul 2014 00:40:28 +0000 (10:40 +1000)

Trivial merge