From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 04:17:57 +0000 (+1000)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20110912~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ebb4bf10e0a41655e4cb6918f92945b2150d7c47;p=karo-tx-linux.git

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/x86/mm/fault.c
---

ebb4bf10e0a41655e4cb6918f92945b2150d7c47