Merge tag 'v3.12'
authorPaul Moore <pmoore@redhat.com>
Fri, 8 Nov 2013 18:56:38 +0000 (13:56 -0500)
committerPaul Moore <pmoore@redhat.com>
Fri, 8 Nov 2013 18:56:38 +0000 (13:56 -0500)
Linux 3.12


Trivial merge