6566ee04818
parent 10e4ac572eeffe5317019bd7330b6058a400dfc2
parent cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941
author Jiri Kosina <jkosina@suse.cz> 1316092085 +0200
committer Jiri Kosina <jkosina@suse.cz> 1316092098 +0200

Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
1ì{g–%x