diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-10 10:15:44 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-10 10:15:44 +0100 |
commit | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (patch) | |
tree | 01a8efbcd56a78fb6eca42c415933eaa8f06bb67 /net/mac80211/iface.c | |
parent | MAINTAINERS: update the sh git tree entry. (diff) | |
parent | rtc: rtc-sh - fix a memory leak (diff) | |
parent | sh: clkfwk: fix up compiler warnings. (diff) | |
download | linux-8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec.tar.xz linux-8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec.zip |
Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent