| commit | 8e58316ba38aa6ffd53e2ada59142ad40cf47744 | |
| author | Tony Lindgren <tony@atomide.com> | |
| Wed, 15 Apr 2009 18:22:24 +0000 (15 11:22 -0700) | ||
| committer | Tony Lindgren <tony@atomide.com> | |
| Wed, 15 Apr 2009 18:22:24 +0000 (15 11:22 -0700) | ||
| tree | 0fb3d259399e065a5825789542664d2c92f38b2f | treesnapshot (tar.gz zip) |
| parent | 12323321f004c9e83061c9a9d06046b050d6d4c7 | commitdiff |
| parent | 09326670a22ee0e89d73cb7dd8773cf7b1e93c5e | commitdiff |
Merge branch 'omap-pool'
Conflicts:
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51.c
drivers/Makefile
Conflicts:
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51.c
drivers/Makefile