diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 15:50:27 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 15:51:06 +0000 |
| commit | f82989bde1cfa5e2b4614d8e4896d795dae418d9 (patch) | |
| tree | 970cd7c833fad85acbf00be335b0ae8c4991b375 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | 695d82fae9160406acb9de204c471248abcc2a9f (diff) | |
| parent | 30c766bdeccf945615097ca185326c1d7199f023 (diff) | |
Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
* 'fixes' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)
ARM: davinci: DA850: move da850_register_pm to .init.text
ARM: davinci: cpufreq: fix compiler warning
(update to v3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
0 files changed, 0 insertions, 0 deletions