diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-12-16 23:01:03 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 23:01:03 +0100 |
| commit | 7f760f1abcd1a36b52776c90f6a601dd90f06ecb (patch) | |
| tree | c5f29a48b528ecc352dbc5c2a246d7860177ac59 /arch/arm/mach-omap2/board-rx51-video.c | |
| parent | Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.... (diff) | |
| parent | ARM: OMAP2+: UART: Fix compilation/sparse warnings (diff) | |
| download | linux-7f760f1abcd1a36b52776c90f6a601dd90f06ecb.tar.xz linux-7f760f1abcd1a36b52776c90f6a601dd90f06ecb.zip | |
Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-video.c')
0 files changed, 0 insertions, 0 deletions