From: John Stultz <john.stultz@linaro.org>
Date: Thu, 9 Feb 2012 22:24:34 +0000 (-0800)
Subject: staging: android-alarm: Fix namespace collision with upstreamed alarmtimers
X-Git-Tag: v3.4-rc1~186^2~176^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2f28eacf240baffbba5e9744278f85fc62ddd60;p=pandora-kernel.git

staging: android-alarm: Fix namespace collision with upstreamed alarmtimers

The upstreamed alarmtimers are similar but not quite 100% API
compatibile with the android in-kernel alarm api. To aid the
transition, prefix the the android in-kernel api with android_

CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed