| author | Tony Lindgren <tony@atomide.com> | |
| Fri, 24 Sep 2010 01:32:15 +0000 (18:32 -0700) | ||
| committer | Tony Lindgren <tony@atomide.com> | |
| Fri, 24 Sep 2010 01:32:15 +0000 (18:32 -0700) | ||
| commit | 9ef6fdec8438f486106fb74915242c806054fd17 | |
| tree | b870d6b5b2983bfec424b55b9bcf60e8cf300f15 | tree | snapshot (tar.xz tar.gz zip) |
| parent | b30a3f6257ed2105259b404d419b4964e363928c | commit | diff |
| parent | 9edd6d76505eb7d3dea4e794418e164329c2ceb3 | commit | diff |
Merge cbus
Conflicts:
arch/arm/mach-omap2/board-n8x0.c
Conflicts:
arch/arm/mach-omap2/board-n8x0.c