Merge branch 'rc-fixes' into for-next

author Michal Marek <mmarek@suse.cz>

Tue, 20 Jul 2010 14:08:59 +0000 (14:08 +0000)

committer Michal Marek <mmarek@suse.cz>

Tue, 20 Jul 2010 14:08:59 +0000 (14:08 +0000)
author Michal Marek <mmarek@suse.cz>
Tue, 20 Jul 2010 14:08:59 +0000 (14:08 +0000)
committer Michal Marek <mmarek@suse.cz>
Tue, 20 Jul 2010 14:08:59 +0000 (14:08 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
author	Michal Marek <mmarek@suse.cz>
	Tue, 20 Jul 2010 14:08:59 +0000 (14:08 +0000)
committer	Michal Marek <mmarek@suse.cz>
	Tue, 20 Jul 2010 14:08:59 +0000 (14:08 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history