diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 10:22:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 10:22:25 -0800 |
| commit | 333a07437c31ea8c16a2b82071629a540ae1e50f (patch) | |
| tree | b2bc63d29d22238add7e4eb66ed841e7cf6b6932 /net/mac80211/ibss.c | |
| parent | d4da6c9ccf648f3f1cb5bf9d981a62c253d30e28 (diff) | |
| parent | e8c93fc7b7221b6ac7e7ddbd0e21e205bf9e801a (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
Revert "[IA64] fix percpu warnings"
[IA64] fix percpu warnings
[IA64] SMT friendly version of spin_unlock_wait()
[IA64] use printk_once() unaligned.c/io_common.c
[IA64] Require SAL 3.2 in order to do extended config space ops
[IA64] unsigned cannot be less than 0 in sn_hwperf_ioctl()
[IA64] Restore registers in the stack on INIT
[IA64] Re-implement spinaphores using ticket lock concepts
[IA64] Squeeze ticket locks back into 4 bytes.
Diffstat (limited to 'net/mac80211/ibss.c')
0 files changed, 0 insertions, 0 deletions