Merge branch 'trivial' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 26 May 2011 08:29:16 +0000 (08:29 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 26 May 2011 08:29:16 +0000 (08:29 +0000)

Trivial merge