Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 28 Jun 2010 15:03:50 +0000 (15:03 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 28 Jun 2010 15:03:50 +0000 (15:03 +0000)

Trivial merge