Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 15 Sep 2011 13:08:05 +0000 (15:08 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 15 Sep 2011 13:08:18 +0000 (15:08 +0200)
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.


Trivial merge