Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
[pandora-kernel.git] / arch / powerpc / platforms / powernv / opal.c
Simple merge