diff options
| author | Arnd Bergmann | 2012-11-15 17:33:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-11-15 17:33:08 +0100 |
| commit | 5fd4d427eda327b783bf84c885fdde38ac726183 (patch) | |
| tree | 8672d146865f541f0405121b01df0fdfb8457f4f /arch/arm/mach-at91 | |
| parent | cb64babf9ebe06984d87c08d241d05e2f6a7eb5b (diff) | |
| parent | 42a1cc9c0ec2a00b53b4f02849dc4377b09b3b05 (diff) | |
Merge tag 'omap-for-v3.8/cleanup-fixes-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren <tony@atomide.com>:
One build fix for recent clean up when CONFIG_PM is not set
and clean up related improvment to the SoC detection.
* tag 'omap-for-v3.8/cleanup-fixes-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: ID: Improve features detection and check
ARM: OMAP: Fix compile for OMAP_PM_NOOP if PM is not selected
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91')
0 files changed, 0 insertions, 0 deletions