Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 10 Jun 2011 12:46:48 +0000 (14:46 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 10 Jun 2011 12:46:57 +0000 (14:46 +0200)
Sync with Linus' tree to be able to apply patches against new
code I have in queue.


Trivial merge