diff options
author | Tony Lindgren <tony@atomide.com> | 2011-10-04 09:47:06 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-10-04 09:47:06 -0700 |
commit | c541c15fb5ab48c47bc9b90121538fd30d152f23 (patch) | |
tree | 5a303080d4729666b709711b65d7fc24b948ad64 /arch/arm/mach-omap2/timer.c | |
parent | 5c30cdfa41821dd89792600118cab5c02a5c322b (diff) | |
parent | be73246058737beec52ae232bcab7776332a9e06 (diff) | |
parent | 7d33910262d2b4e36742985269456bd519b38d46 (diff) | |
parent | ab4eb8b098c7591459b066cec0325a63792e463b (diff) | |
parent | dc9ca24f4d7a5ff33d7e12ca809564d37188212b (diff) | |
download | linux-3.10-c541c15fb5ab48c47bc9b90121538fd30d152f23.tar.gz linux-3.10-c541c15fb5ab48c47bc9b90121538fd30d152f23.tar.bz2 linux-3.10-c541c15fb5ab48c47bc9b90121538fd30d152f23.zip |
Merge branches 'cleanup-part3', 'voltage', 'dmtimer' and 'l3' into dt-base