Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 11 Jul 2011 12:15:48 +0000 (14:15 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 11 Jul 2011 12:15:55 +0000 (14:15 +0200)
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.


Trivial merge