Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 26 Nov 2010 15:07:08 +0000 (15:07 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 26 Nov 2010 15:07:08 +0000 (15:07 +0000)

Trivial merge