Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 29 Apr 2011 15:01:51 +0000 (15:01 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 29 Apr 2011 15:01:51 +0000 (15:01 +0000)

Trivial merge