From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 04:16:16 +0000 (+1100)
Subject: Merge remote-tracking branch 'drivers-x86/linux-next'
X-Git-Tag: next-20130220~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=abe9c39afefddc2d670cc2abf8c3537f2172d66d;p=karo-tx-linux.git

Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
	drivers/platform/x86/apple-gmux.c
	drivers/platform/x86/compal-laptop.c
	drivers/platform/x86/fujitsu-tablet.c
	drivers/platform/x86/ideapad-laptop.c
	drivers/platform/x86/intel_oaktrail.c
	drivers/platform/x86/toshiba_acpi.c
---

abe9c39afefddc2d670cc2abf8c3537f2172d66d