[kernel: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel

[Justin M. Forbes]

commit ed866e80868ed770e5bf9e7470b32e073627fa5c
Merge: 6e82a62 1b028bf
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Fri Oct 5 15:39:05 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel

 kernel.spec                |    5 ++-
 secure-boot-20120924.patch |   70 ++++++++++++++++++++++++++++---------------
 2 files changed, 49 insertions(+), 26 deletions(-)
---