Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 14:10:31 +0000 (14:10 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 14:10:31 +0000 (14:10 +0000)

Trivial merge