tree 693061ebde2abc35ecc846e5084630d7225aaaff
parent d820ac4c2fa881079e6b689d2098adce337558ae
parent 15f7176eb1cccec0a332541285ee752b935c1c85
author Ingo Molnar <mingo@elte.hu> 1238500423 +0200
committer Ingo Molnar <mingo@elte.hu> 1238500423 +0200

Merge branch 'linus' into locking-for-linus

Conflicts:
	lib/Kconfig.debug