From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Oct 2012 15:37:12 +0000 (-0700)
Subject: Merge 3.7-rc3 into staging-next
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~907
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8;p=pandora-kernel.git

Merge 3.7-rc3 into staging-next

This resolves the conflict with:
	drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8
Reading git-diff-tree failed