diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 16:36:42 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 16:36:42 +0100 |
commit | 001c5c4aaaffda840184700b8f488ced3c9dd0a1 (patch) | |
tree | 66f4dbc3b8fc7bb2e29ad7d69793425f59efc187 /drivers/net/wireless/mwifiex/scan.c | |
parent | b0db321ba14daca748d5c8ca89298fdb637f9ba8 (diff) | |
parent | f9047306fd7332d682898dd689152bb3b45a3e73 (diff) | |
download | talos-obmc-linux-001c5c4aaaffda840184700b8f488ced3c9dd0a1.tar.gz talos-obmc-linux-001c5c4aaaffda840184700b8f488ced3c9dd0a1.zip |
Merge tag 'renesas-soc5-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
This resolves a panic-on-boot regression introduced by me when incorrectly
updating TMU clock definitions.
* tag 'renesas-soc5-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Correct TMU clock support again
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/wireless/mwifiex/scan.c')
0 files changed, 0 insertions, 0 deletions