On Nov 3, 2010, at 4:36 AM, Shaohui Xie wrote:

Signed-off-by: Shaohui Xie <redacted>
Cc: Li Yang <redacted>
Cc: Kumar Gala <redacted>
Cc: Roy Zang <redacted>
Cc: Alexandre Bounine <redacted>
---
arch/powerpc/kernel/cpu_setup_fsl_booke.S |    6 ++++++
arch/powerpc/sysdev/fsl_rio.c             |    2 --
2 files changed, 6 insertions(+), 2 deletions(-)

applied to next

- k