Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 8 Jul 2010 13:11:46 +0000 (13:11 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 8 Jul 2010 13:11:46 +0000 (13:11 +0000)

Trivial merge