tree b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42
parent 37f9ef553bed630957e025504cdcbc76f5de49d5
parent 8ebf975608aaebd7feb33d77f07ba21a6380e086
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1244789618 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1244789618 +1000

Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/kernel/asm-offsets.c