diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-29 15:34:05 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-29 15:34:14 -0800 |
commit | 6f7246b272e5c2f1ce27733c371b1206286640bc (patch) | |
tree | 475a4dfb4becbe289bd263636721c5f62ca30d4f /net/mac80211 | |
parent | c51cdd9b2441a16332ec57fc7cb4d9ac6b927437 (diff) | |
parent | aab7da708649388afc041b173e7d2cf0c4b27e50 (diff) |
Merge tag 'vexpress/fixes-for-3.9' of git://git.linaro.org/people/pawelmoll/linux into next/fixes-non-critical
From Pawel Moll:
Versatile Express related fixes for 3.9
* Correct interrupt definitions for WDT node in
V2P-CA15 and V2P-CA15_A7 Device Trees
* tag 'vexpress/fixes-for-3.9' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Fix wdt interrupt in ca15{-tc1,_a7} dts
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions