cd7dad51236b2a515a1a
parent 86d710146fb9975f04c505ec78caa43d227c1018
author David S. Miller <davem@davemloft.net> 1252726513 -0700
committer David S. Miller <davem@davemloft.net> 1252726513 -0700

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	arch/sparc/Kconfig
Ëøl@”