Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 6 Oct 2010 12:53:33 +0000 (12:53 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 6 Oct 2010 12:53:33 +0000 (12:53 +0000)

Trivial merge