| commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Sep 12 22:34:11 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Sep 12 22:34:11 2012 -0700 |
| tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 | |
| parent | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 [diff] | |
| parent | 7f744b17140af1a9c8804a1c81c9dae6bb52a7fb [diff] |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup * 'clk' of git://github.com/hzhuang1/linux: ARM: mmp: remove unused definition in APBC and APMU ARM: mmp: move mmp2 clock definition to separated file arm: mmp: move pxa910 clock definition to separated file arm: mmp: move pxa168 clock definition to separated file arm: mmp: make private clock definition exclude from common clock + Linux 3.6-rc4