Merge tag 'v3.12'
authorPaul Moore <pmoore@redhat.com>
Tue, 26 Nov 2013 22:32:55 +0000 (17:32 -0500)
committerPaul Moore <pmoore@redhat.com>
Tue, 26 Nov 2013 22:32:55 +0000 (17:32 -0500)
Linux 3.12


Trivial merge