Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 1 Sep 2010 13:02:34 +0000 (13:02 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 1 Sep 2010 13:02:34 +0000 (13:02 +0000)

Trivial merge