Linus Torvalds
608307e6de
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator
ipvs: avoid oops for passive FTP
Revert "sky2: don't do GRO on second port"
gro: fix different skb headrooms
bridge: Clear INET control block of SKBs passed into ip_fragment().
3c59x: Remove incorrect locking; correct documented lock hierarchy
sky2: don't do GRO on second port
ipv4: minor fix about RPF in help of Kconfig
xfrm_user: avoid a warning with some compiler
net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf()
pxa168_eth: fix a mdiobus leak
net sched: fix kernel leak in act_police
vhost: stop worker only if created
MAINTAINERS: Add ehea driver as Supported
ath9k_hw: fix parsing of HT40 5 GHz CTLs
ath9k_hw: Fix EEPROM uncompress block reading on AR9003
wireless: register wiphy rfkill w/o holding cfg80211_mutex
netlink: Make NETLINK_USERSOCK work again.
irda: Correctly clean up self->ias_obj on irda_bind() failure.
wireless extensions: fix kernel heap content leak
...
2010-09-07 14:06:10 -07:00
ath9k_hw: fix parsing of HT40 5 GHz CTLs
2010-08-31 14:52:23 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2010-06-11 11:34:06 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
ipw2100: don't sync status queue entries
2010-08-17 14:38:14 -04:00
iwlwifi: use long monitor timer for 5300 series
2010-08-18 16:37:44 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2010-07-01 17:34:14 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-09-07 14:06:10 -07:00
param: simple locking for sysfs-writable charp parameters
2010-08-11 23:04:31 +09:30
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
p54: fix tx feedback status flag check
2010-08-30 16:02:32 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2010-07-13 15:57:29 -04:00
rt2x00: do not use PCI resources before pci_enable_device()
2010-08-04 15:28:37 -04:00
drivers/net/wireless: Restore upper case words in wiphy_<level> messages
2010-08-18 16:37:44 -04:00
wl1251: fix trigger scan timeout usage
2010-08-13 13:46:19 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2010-06-17 14:19:06 -07:00
drivers/net/wireless: Restore upper case words in wiphy_<level> messages
2010-08-18 16:37:44 -04:00
drivers/net: use __packed annotation
2010-06-03 03:18:23 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
2010-07-27 11:59:19 -04:00
pcmcia: do not request windows if you don't need to
2010-08-03 09:04:21 +02:00
drivers/net/wireless: Restore upper case words in wiphy_<level> messages
2010-08-18 16:37:44 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2010-07-01 17:34:14 -07:00
pcmcia: do not use io_req_t when calling pcmcia_request_io()
2010-08-03 09:04:11 +02:00
drivers/net/wireless: Restore upper case words in wiphy_<level> messages
2010-08-18 16:37:44 -04:00
drivers/net/wireless: Restore upper case words in wiphy_<level> messages
2010-08-18 16:37:44 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2010-07-01 17:34:14 -07:00
drivers/net: use __packed annotation
2010-06-03 03:18:23 -07:00
pcmcia: do not use io_req_t when calling pcmcia_request_io()
2010-08-03 09:04:11 +02:00
608307e6de