Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 10:01:07 +0000 (12:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 10:01:07 +0000 (12:01 +0200)
commit6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377
treec250644c5adce04947d664318996de16df3f02da
parentb96516220870d8571fc12da980668687c122976e
parente4aa937ec75df0eea0bee03bffa3303ad36c986b
Merge branch 'master' into for-next