From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Nov 2011 01:22:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20111109~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=530c82fc1f2d941b06ed0d8f54994bcb74a5f40c;p=karo-tx-linux.git

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

Conflicts:
	arch/x86/kernel/cpu/amd.c
	drivers/char/random.c
---

530c82fc1f2d941b06ed0d8f54994bcb74a5f40c