From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Aug 2011 04:08:28 +0000 (+1000)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20110823~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17ab545e36d8f8bea04de4aa38e837c24551cd61;p=karo-tx-linux.git

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

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

17ab545e36d8f8bea04de4aa38e837c24551cd61