diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-12-16 14:01:03 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 14:01:03 -0800 |
| commit | 7f760f1abcd1a36b52776c90f6a601dd90f06ecb (patch) | |
| tree | c5f29a48b528ecc352dbc5c2a246d7860177ac59 /arch/arm/mach-s3c2412/mach-smdk2413.c | |
| parent | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (diff) | |
| parent | da27468655540b083525177f5dc6f3b1f6e3b869 (diff) | |
| download | blackbird-obmc-linux-7f760f1abcd1a36b52776c90f6a601dd90f06ecb.tar.gz blackbird-obmc-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-s3c2412/mach-smdk2413.c')
0 files changed, 0 insertions, 0 deletions
