Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 29 Jun 2010 13:27:42 +0000 (13:27 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 29 Jun 2010 13:27:42 +0000 (13:27 +0000)

Trivial merge