Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 26 Apr 2011 08:22:15 +0000 (10:22 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 26 Apr 2011 08:22:59 +0000 (10:22 +0200)
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.


Trivial merge