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

Trivial merge