Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 10 Feb 2011 15:00:56 +0000 (15:00 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 10 Feb 2011 15:00:56 +0000 (15:00 +0000)

Trivial merge