ee 3763bf5b68feca1088c5a87c6bdb23b14c42b736
parent 35da7a307c535f9c2929cae277f3df425c9f9b1e
parent 569b10a506c4d5bc7398d040930539d84d3a2186
parent cb174681a9ececa6702f114b85bdf82144b6a5af
author Jiri Kosina <jkosina@suse.cz> 1287866676 +0200
committer Jiri Kosina <jkosina@suse.cz> 1287866676 +0200

Merge branches 'upstream' and 'upstream-fixes' into for-linus
4n‡‘&x