Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 14 Dec 2010 16:11:47 +0000 (16:11 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 14 Dec 2010 16:11:47 +0000 (16:11 +0000)

Trivial merge