Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Fri, 4 Oct 2013 05:00:33 +0000 (07:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 4 Oct 2013 05:00:33 +0000 (07:00 +0200)
commit66f7603e87e95c53dacbb3e14f61637ebebc1c58
tree89564c0b41daa979c2116df1fb42f8885c2958ae
parentdb51d0a907f1b4fe25ab6e97cd085b9d24d839bb
parent029da8f6c4e234ce83bd758bd5cddda54ccb7d06
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes