Merge branch 'packaging' into SLE12
authorMichal Marek <mmarek@suse.cz>
Tue, 1 Jul 2014 15:15:56 +0000 (17:15 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 1 Jul 2014 15:15:56 +0000 (17:15 +0200)
commit769b21f8577d90e24f619cd3335cc94d789903a7
treecd862cc46537f65255de6453aa16847b2b87501b
parenta701c0d0d8bf6774342e1074f6e4d5ff50fbd314
parent381a192dc697bbbf6e429a435d7d31bda1d0772b
Merge branch 'packaging' into SLE12

Conflicts:
rpm/kernel-source.spec.in
rpm/kernel-binary.spec.in
rpm/kernel-source.spec.in