From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 May 2012 18:48:07 +0000 (-0700)
Subject: Merge 3.4-rc5 into staging-next
X-Git-Tag: v3.5-rc1~145^2~229
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d210267741fb2a8b6d741d9040703683a39087f4;p=pandora-kernel.git

Merge 3.4-rc5 into staging-next

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

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

d210267741fb2a8b6d741d9040703683a39087f4
Reading git-diff-tree failed