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

Trivial merge