diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-13 07:34:11 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-13 07:34:11 +0200 |
commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /arch/m68k/mac/misc.c | |
parent | Merge branch 'ks8695/timer' into next/cleanup (diff) | |
parent | ARM: mmp: remove unused definition in APBC and APMU (diff) | |
download | linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.tar.xz linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.zip |
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
Diffstat (limited to 'arch/m68k/mac/misc.c')
0 files changed, 0 insertions, 0 deletions