commit | 0bce55b7f07b9ed0e33def2acdb99a2196be58b3 | [log] [tgz] |
---|---|---|
author | Michal Marek <mmarek@suse.cz> | Tue Jun 25 07:00:29 2013 +0200 |
committer | Michal Marek <mmarek@suse.cz> | Tue Jun 25 07:00:29 2013 +0200 |
tree | 90967ce7de8e15586b2b6bfeacaeb75e88666634 | |
parent | 8209e1e55d7f39ac26af1e4e1458c82686c5bff4 [diff] | |
parent | 816f25a283569ea2a1f226051625635ebfd86650 [diff] |
Merge branch 'SLE11-SP2' into SLE11-SP3 Conflicts: kernel-source.changes suse-commit: 92d19729996e7a949b30bbe386d0da3b1cabef33