diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-07 14:05:13 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-07 14:05:13 -0800 |
commit | 412fe6b3a1f6fa6c88c11c8d2b2422b79342de8c (patch) | |
tree | d07592e2676135dd7cbcc8535fc3625179356a95 /arch/arm/mach-omap2/pm.c | |
parent | c6dbba0e45edb1a88d97bc8118c4e8332c603076 (diff) | |
parent | f558b275439a9d14a1e2a754484f81ecebf56764 (diff) |
Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
* 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
0 files changed, 0 insertions, 0 deletions