diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:33:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:33:43 -0700 |
commit | 585eb6daa4b6886ab92ff914f55e8e87f7c2670b (patch) | |
tree | 8fa1927675f7ebb6b3f4d7b4ee0d0cb02a786492 /net/mac80211/ieee80211_sta.c | |
parent | 844d6c48be7f11592d287a9fe2183007c4ebfbbb (diff) | |
parent | cca67164bbdb083df9adb6480822518b0f4b358f (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
[AVR32] Define mmiowb()
[AVR32] Fix bogus pte_page() definition
[AVR32] Simplify pte_alloc_one{,_kernel}
include/asm-avr32/pgalloc.h: kmalloc + memset conversion to kcalloc
[AVR32] Wire up i2c-gpio on the ATNGW100 board
[AVR32] leds-gpio for stk1000
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
0 files changed, 0 insertions, 0 deletions