diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:14:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:14:37 +0100 |
| commit | 794c1539ab391e1278bec0d69015d9b4e75bdaf0 (patch) | |
| tree | d2c2259afc46f724cc288eb13e82aa953c3a633a /sound/oss/dev_table.c | |
| parent | f75ed2d39562e19e4d1896c07e7f091515c6d11d (diff) | |
| parent | 16defa668d009a762e23d55ce6ecf5ae483dfe10 (diff) | |
| download | linux-794c1539ab391e1278bec0d69015d9b4e75bdaf0.tar.gz linux-794c1539ab391e1278bec0d69015d9b4e75bdaf0.tar.bz2 linux-794c1539ab391e1278bec0d69015d9b4e75bdaf0.zip | |
Merge tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/multiplatform
From Linus Walleij <linus.walleij@linaro.org>:
This tag contains two MTU patches based on top of the ux500 sparse IRQ
commit to avoid merge clashes.
* tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
clocksource/mtu-nomadik: use apb_pclk
clk: ux500: Register mtu apb_pclocks
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound/oss/dev_table.c')
0 files changed, 0 insertions, 0 deletions