From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:48:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'acpi/next'
X-Git-Tag: next-20121008~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=baf6cbc93ee2ba25ccce3df8d71702fb48299aac;p=karo-tx-linux.git

Merge remote-tracking branch 'acpi/next'

Conflicts:
	include/acpi/acpixf.h
---

baf6cbc93ee2ba25ccce3df8d71702fb48299aac