Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 23:02:26 +0000 (23:02 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 23:02:26 +0000 (23:02 +0000)

Trivial merge