From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Jun 2012 16:31:00 +0000 (-0700)
Subject: Merge 3.5-rc4 into staging-next
X-Git-Tag: v3.6-rc1~100^2~596
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcc66c0b8881f88459f9ac21038455bcafacdc6e;p=platform%2Fkernel%2Flinux-3.10.git

Merge 3.5-rc4 into staging-next

This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.

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

bcc66c0b8881f88459f9ac21038455bcafacdc6e