Rohit Vaswani a76e99abc5 Merge branch 'Linux 3.0.21' into msm-3.0 ...

Merge Upstream's stable 3.0.21 branch into msm-3.0
This consists 814 commits and some merge conflicts.

The merge conflicts are because of some local changes to
msm-3.0 as well as some conflicts between google's tree and
the upstream tree.

Conflicts:
	arch/arm/kernel/head.S
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/mmc/core/core.c
	drivers/tty/serial/serial_core.c
	drivers/usb/host/ehci-hub.c
	drivers/usb/serial/qcserial.c
	fs/namespace.c
	fs/proc/base.c

Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>

2012-03-30 00:09:34 -07:00

..

aes_ccm.c

mac80211: Fix warnings due to -Wunused-but-set-variable

2011-04-26 15:50:31 -04: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

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

agg-tx.c

mac80211: fix another race in aggregation start

2012-01-06 14:13:48 -08:00

cfg.c

mac80211: fix offchannel TX cookie matching

2011-11-11 09:35:51 -08: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: sparse RCU annotations

2011-05-16 14:10:41 -04:00

debugfs_key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_netdev.c

mac80211: fix SMPS debugfs locking

2011-04-20 16:05:59 -04:00

debugfs_netdev.h

mac80211: reduce reliance on netdev

2009-12-21 18:38:52 -05:00

debugfs_sta.c

mac80211: fix debugfs printk format warning

2011-04-19 15:38:03 -04:00

debugfs_sta.h

…

debugfs.c

mac80211: add basic support for WoWLAN

2011-05-05 14:59:20 -04:00

debugfs.h

mac80211: refactor debugfs function generation code

2010-11-15 13:24:48 -05:00

driver-ops.h

mac80211: add support for HW scheduled scan

2011-05-11 15:12:27 -04:00

driver-trace.c

mac80211: fix sparse warnings/errors

2009-08-04 16:43:25 -04:00

driver-trace.h

mac80211: add support for HW scheduled scan

2011-05-11 15:12:27 -04:00

event.c

…

ht.c

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

ibss.c

mac80211: fix IBSS teardown race

2011-06-08 14:19:05 -04:00

ieee80211_i.h

mac80211: disable powersave for broken APs

2011-11-11 09:37:13 -08:00

iface.c

net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared

2011-08-15 18:31:38 -07:00

Kconfig

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

key.c

Revert "mac80211: Skip tailroom reservation for full HW-crypto devices"

2011-06-06 15:23:53 -04:00

key.h

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04: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 missing rcu_barrier

2011-05-16 14:25:29 -04:00

Makefile

mac80211: add the minstrel_ht rate control algorithm

2010-06-02 16:12:59 -04:00

mesh_hwmp.c

mac80211: sparse RCU annotations

2011-05-16 14:10:41 -04:00

mesh_pathtbl.c

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-05-24 16:47:54 -04:00

mesh_plink.c

nl80211: Move peer link state definition to nl80211

2011-05-16 14:10:49 -04:00

mesh.c

mac80211: mesh: move some code to make it static

2011-05-12 14:10:55 -04:00

mesh.h

mac80211: annotate and fix RCU in mesh code

2011-05-16 14:25:29 -04:00

michael.c

…

michael.h

…

mlme.c

mac80211: disable powersave for broken APs

2011-11-11 09:37:13 -08:00

offchannel.c

mac80211: Optimize scans on current operating channel.

2011-02-04 16:30:32 -05:00

pm.c

mac80211: add basic support for WoWLAN

2011-05-05 14:59:20 -04:00

rate.c

cfg80211/mac80211: improve ad-hoc multicast rate handling

2010-11-24 16:19:35 -05:00

rate.h

mac80211: add the minstrel_ht rate control algorithm

2010-06-02 16:12:59 -04:00

rc80211_minstrel_debugfs.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

rc80211_minstrel_ht_debugfs.c

mac80211: disallow seeks in minstrel debug code

2010-09-16 10:33:17 +02:00

rc80211_minstrel_ht.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-05-16 19:32:19 -04:00

rc80211_minstrel_ht.h

minstrel_ht: move minstrel_mcs_groups declaration to header file

2010-06-24 15:42:18 -04:00

rc80211_minstrel.c

mac80211: fix contention time computation in minstrel, minstrel_ht

2011-05-12 14:10:48 -04:00

rc80211_minstrel.h

minstrel: make the rate control ops reusable from another rc implementation

2010-03-10 17:44:23 -05:00

rc80211_pid_algo.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

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

Fix common misspellings

2011-03-31 11:26:23 -03:00

rx.c

mac80211: fix NULL dereference in radiotap code

2011-11-26 09:09:54 -08:00

scan.c

mac80211: fix ie memory allocation for scheduled scans

2011-07-07 13:06:08 -04:00

spectmgmt.c

mac80211: reduce reliance on netdev

2009-12-21 18:38:52 -05:00

sta_info.c

cfg80211/nl80211: Send AssocReq IEs to user space in AP mode

2011-12-22 10:53:33 +05:30

sta_info.h

nl80211: Move peer link state definition to nl80211

2011-05-16 14:10:49 -04:00

status.c

mac80211: fix offchannel TX cookie matching

2011-11-11 09:35:51 -08:00

tkip.c

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

tkip.h

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

tx.c

Revert "mac80211: Skip tailroom reservation for full HW-crypto devices"

2011-06-06 15:23:53 -04:00

util.c

mac80211: fix bug in ieee80211_build_probe_req

2011-11-26 09:09:54 -08:00

wep.c

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

wep.h

mac80211: remove the dependency on crypto_blkcipher

2011-04-04 16:20:00 -04:00

wme.c

mac80211: cleanup select_queue

2010-12-22 15:44:22 -05:00

wme.h

mac80211: fix skb buffering issue

2010-01-05 16:21:40 -05:00

work.c

mac80211: config hw when going back on-channel

2011-11-11 09:37:12 -08:00

wpa.c

mac80211: fix rx->key NULL pointer dereference in promiscuous mode

2012-01-25 17:24:43 -08:00

wpa.h

…