From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:56:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'tile/master'
X-Git-Tag: next-20111103~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b86494f8491f86870f191742aa46c8f36ac72cfa;p=karo-tx-linux.git

Merge remote-tracking branch 'tile/master'

Conflicts:
	arch/tile/kernel/intvec_32.S
	arch/tile/lib/atomic_asm_32.S
---

b86494f8491f86870f191742aa46c8f36ac72cfa