Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 29 Sep 2010 15:04:16 +0000 (15:04 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 29 Sep 2010 15:04:16 +0000 (15:04 +0000)

Trivial merge