Merge branch 'bnc783965' into SLE11-SP2
authorMichal Hocko <mhocko@suse.cz>
Thu, 11 Oct 2012 09:09:22 +0000 (11:09 +0200)
committerMichal Hocko <mhocko@suse.cz>
Thu, 11 Oct 2012 09:09:22 +0000 (11:09 +0200)
commit77a1aba76df6f9e4f74290383b22c194ec13ad41
tree8c9adfcaa8d8bb98f214a06d380e268bff799dfd
parent7053d8d059db9e48d59d37e42a5ad97eb9a9fc81
parent87462b008e7e8270e9619c9fc93b929838409455
Merge branch 'bnc783965' into SLE11-SP2

Conflicts:
series.conf
kernel-source.changes
series.conf