From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Nov 2012 15:46:04 +0000 (-0800)
Subject: Merge tag 'staging-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: upstream/snapshot3+hdmi~6250
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e111565b70e57ae45d154d79581ecc591d19d9a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'staging-3.7-rc5' of git://git./linux/kernel/git/gregkh/staging

Pull staging tree fix from Greg Kroah-Hartman:
 "Here is a single patch, a revert of an android driver patch, that
  resolves a bug that has been reported in the Android alarm driver.

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

* tag 'staging-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Revert "Staging: Android alarm: IOCTL command encoding fix"
---

7e111565b70e57ae45d154d79581ecc591d19d9a