diff options
| author | Linus Torvalds | 2013-03-18 08:11:53 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-03-18 08:11:53 -0700 |
| commit | 6210d421c20f12ef4e8c9826973478beb104114d (patch) | |
| tree | 18658fa413f6d44ca29212d95ae4c9d480d5fd22 /drivers/net/wireless/iwlwifi/iwl-trans.h | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
| parent | 2c36af0e559c0a0674ad846527116df41aa5f612 (diff) | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Just three fixes this time - a fix for a fix for our memset function,
fixing the dummy clockevent so that it doesn't interfere with real
hardware clockevents, and fixing a build error for Tegra."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME
ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real hardware clock-event
ARM: 7670/1: fix the memset fix
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
0 files changed, 0 insertions, 0 deletions