| commit | 12d7d4e0ed8fecf7f74c89483b55b300be6e5901 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Wed Mar 02 17:07:14 2011 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Wed Mar 02 17:07:14 2011 -0800 |
| tree | f573761ac752ff04ec445e23aef50adadda49790 | |
| parent | aca6ad073ea820776bf5bdb87cf82eace35042c8 [diff] | |
| parent | 790ab7e92bec24aee3939b300d36b99ab2e3f3ca [diff] |
Merge branch 'devel-cleanup' into omap-for-linus Conflicts: arch/arm/mach-omap2/timer-gp.c