diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:44:54 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:44:54 -0400 |
| commit | 970a724d9173526512ebd8be991a4cbe18b7aace (patch) | |
| tree | 7541c2b34e82ccabb068bdae530936838a71fad8 /arch/arm/mach-omap1/sleep.S | |
| parent | c81592ba1b012d555d0cb7ec711afda89c327469 (diff) | |
| parent | 4a899d5e93fd974952492cd4a09e98b209d1ad58 (diff) | |
Merge branch 'omap3-upstream' into for-next
Conflicts:
arch/arm/mach-omap2/serial.c
Diffstat (limited to 'arch/arm/mach-omap1/sleep.S')
0 files changed, 0 insertions, 0 deletions