Merge branch 'next' into upstream for v3.19
authorPaul Moore <pmoore@redhat.com>
Tue, 9 Dec 2014 19:38:30 +0000 (14:38 -0500)
committerPaul Moore <pmoore@redhat.com>
Tue, 9 Dec 2014 19:38:30 +0000 (14:38 -0500)

Trivial merge