diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:24:55 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:24:55 +0200 |
commit | b9b6b7ae964582ac9cf8dbad9127a4cccfd30751 (patch) | |
tree | 24ad1d18a70945f94a43f533c8c6cdc22acb8c09 /drivers/usb/gadget/uvc.h | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
parent | 3ebabaa534c79a54c11a4ec1a81e62b76a4ada0c (diff) | |
download | blackbird-op-linux-b9b6b7ae964582ac9cf8dbad9127a4cccfd30751.tar.gz blackbird-op-linux-b9b6b7ae964582ac9cf8dbad9127a4cccfd30751.zip |
Merge branch 'ux500-cpuidle-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cpuidle
From: Linus Walleij <linus.walleij@linaro.org>
* 'ux500-cpuidle-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: add the cpuidle driver for WFI and ARM retention
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb/gadget/uvc.h')
0 files changed, 0 insertions, 0 deletions