From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 May 2013 00:51:18 +0000 (+1000)
Subject: Merge remote-tracking branch 'parisc-hd/for-next'
X-Git-Tag: next-20130527~87
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8d5a5404af78eb83c80119837faac9fc52967c1b;p=karo-tx-linux.git

Merge remote-tracking branch 'parisc-hd/for-next'

Conflicts:
	arch/parisc/include/asm/processor.h
	arch/parisc/kernel/irq.c
---

8d5a5404af78eb83c80119837faac9fc52967c1b