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)
commit5be5758c114b18260c6fd4c8373bf89e39b0fe82
tree54390f904df6ff11e570f764c444356cf2709fda
parent71f66a6580c4e42df377bebbcca5c72661a40700
parent7f45e5cd1718ed769295033ca214032848a0097d
Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patches against new
code I have in queue.