Merge branch 'master' into upstream
[pandora-kernel.git] / arch / arm / mach-shmobile / intc-sh7372.c
Simple merge