Merge branch 'rc-fixes' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 4 Feb 2011 14:03:41 +0000 (14:03 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 4 Feb 2011 14:03:41 +0000 (14:03 +0000)

Trivial merge