Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits) doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore Update cpuset info & webiste for cgroups dcdbas: force SMI to happen when expected arch/arm/Kconfig: remove one to many l's in the word. asm-generic/user.h: Fix spelling in comment drm: fix printk typo 'sracth' Remove one to many n's in a word Documentation/filesystems/romfs.txt: fixing link to genromfs drivers:scsi Change printk typo initate -> initiate serial, pch uart: Remove duplicate inclusion of linux/pci.h header fs/eventpoll.c: fix spelling mm: Fix out-of-date comments which refers non-existent functions drm: Fix printk typo 'failled' coh901318.c: Change initate to initiate. mbox-db5500.c Change initate to initiate. edac: correct i82975x error-info reported edac: correct i82975x mci initialisation edac: correct commented info fs: update comments to point correct document target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c ... Trivial conflict in fs/eventpoll.c (spelling vs addition)		2011-03-18 10:37:40 -07:00
..
aes_ccm.c	mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()	2010-11-15 13:26:11 -05:00
aes_ccm.h
aes_cmac.c	mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()	2010-11-15 13:26:11 -05:00
aes_cmac.h
agg-rx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-01-28 16:23:14 -05:00
agg-tx.c	mac80211: allow advertising correct maximum aggregate size	2011-01-19 11:36:12 -05:00
cfg.c	mac80211: implement support for cfg80211_ops->{get,set}_ringparam	2011-03-11 15:34:10 -05:00
cfg.h
chan.c	mac80211: fix channel type recalculation with HT and non-HT interfaces	2011-03-14 14:46:58 -04:00
debugfs_key.c	mac80211: support separate default keys	2010-12-13 15:23:29 -05:00
debugfs_key.h	mac80211: support separate default keys	2010-12-13 15:23:29 -05:00
debugfs_netdev.c	mac80211: Add testing functionality for TKIP	2011-02-03 16:45:29 -05:00
debugfs_netdev.h
debugfs_sta.c	mac80211: Add timeout to BA session start API	2010-12-15 17:03:59 -05:00
debugfs_sta.h
debugfs.c	mac80211: Add power to debugfs.	2011-02-18 16:53:21 -05:00
debugfs.h	mac80211: refactor debugfs function generation code	2010-11-15 13:24:48 -05:00
driver-ops.h	mac80211: implement support for cfg80211_ops->{get,set}_ringparam	2011-03-11 15:34:10 -05:00
driver-trace.c
driver-trace.h	mac80211: implement support for cfg80211_ops->{get,set}_ringparam	2011-03-11 15:34:10 -05:00
event.c
ht.c	mac80211: copy peer MCS TX parameters	2011-02-25 15:33:39 -05:00
ibss.c	mac80211: remove IBSS merge delay	2011-02-25 15:32:34 -05:00
ieee80211_i.h	mac80211: support direct offchannel TX offload	2011-02-25 15:33:40 -05:00
iface.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-03-04 14:10:40 -05:00
key.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-01-05 14:35:41 -05:00
key.h	mac80211: remove unused macros	2011-03-07 13:48:30 -05:00
led.c	mac80211: remove stray extern	2011-01-05 16:07:12 -05:00
led.h	mac80211: selective throughput LED trigger active	2010-12-22 14:33:37 -05:00
main.c	mac80211: Add log message to ieee80211_restart_hw()	2011-03-07 13:51:04 -05:00
Makefile
mesh_hwmp.c	nl80211/mac80211: define and allow configuring mesh element TTL	2010-12-06 16:01:28 -05:00
mesh_pathtbl.c	nl80211/mac80211: define and allow configuring mesh element TTL	2010-12-06 16:01:28 -05:00
mesh_plink.c	mac80211: Let userspace enable and configure vendor specific path selection.	2010-12-20 14:46:57 -05:00
mesh.c	cfg80211: Extend channel to frequency mapping for 802.11j	2011-01-21 15:34:17 -05:00
mesh.h	mac80211: Remove unused third address from mesh address extension header.	2010-12-20 14:49:47 -05:00
michael.c
michael.h
mlme.c	mac80211: do not enable ps if 802.1x controlled port is unblocked	2011-03-11 14:15:37 -05:00
offchannel.c	mac80211: Optimize scans on current operating channel.	2011-02-04 16:30:32 -05:00
pm.c
rate.c	cfg80211/mac80211: improve ad-hoc multicast rate handling	2010-11-24 16:19:35 -05:00
rate.h
rc80211_minstrel_debugfs.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c	mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devices	2011-03-14 14:46:58 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_pid_algo.c
rc80211_pid_debugfs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
rc80211_pid.h	mac80211: remove unused macros	2011-03-07 13:48:30 -05:00
rx.c	mac80211: add support for showing the last rx bitrate	2011-03-01 13:48:21 -05:00
scan.c	mac80211: fix scan race, simplify code	2011-03-07 13:51:04 -05:00
spectmgmt.c
sta_info.c	mac80211: add HW flag for disabling auto link-PS in AP mode	2011-02-03 16:44:44 -05:00
sta_info.h	mac80211: add support for showing the last rx bitrate	2011-03-01 13:48:21 -05:00
status.c	mac80211: support direct offchannel TX offload	2011-02-25 15:33:40 -05:00
tkip.c
tkip.h
tx.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
util.c	Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-02-18 17:03:41 -05:00
wep.c
wep.h
wme.c	mac80211: cleanup select_queue	2010-12-22 15:44:22 -05:00
wme.h
work.c	mac80211: remove unused macros	2011-03-07 13:48:30 -05:00
wpa.c	mac80211: Add testing functionality for TKIP	2011-02-03 16:45:29 -05:00
wpa.h