Merge commit '73053d973' into smp-hotplug

This is to fix a merge problem with mach-highbank/hotplug.c, which git
silently resolves, but wrongly.  This commit contains the correct
resolution.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --cc arch/arm/mach-highbank/hotplug.c
index 35dd42e216856a03047635ddc249e75b5201fd69,890cae23c12aee40b3f0d675e54d590b13965a5c..a019e4e86e517b74826d6aca3f4f14e6e17b0c4a
--- 1/arch/arm/mach-highbank/hotplug.c
--- 2/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@@ -14,6 -14,8 +14,7 @@@
   * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  #include <linux/kernel.h>
 -
+ #include <asm/cacheflush.h>
  
  #include "core.h"
  #include "sysregs.h"