]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
Merge branch 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable...
authorDan Murphy <dmurphy@ti.com>
Fri, 5 Apr 2013 17:43:18 +0000 (12:43 -0500)
committerDan Murphy <dmurphy@ti.com>
Fri, 5 Apr 2013 17:43:18 +0000 (12:43 -0500)
commit29d525312fefa2c8060fd730d7f0b96658481e11
treef4fd8a3db3558361bd59922d0385ffb4750c5e86
parenta7f8de993f9025f92a434f739290940a4a416fdd
parent00cfbb8ad0a6419f40660362b4d8b5baa30d3efe
Merge branch 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.8.y

* 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (125 commits)
  Linux 3.8.6
  bonding: get netdev_rx_handler_unregister out of locks
  smsc75xx: fix jumbo frame support
  pch_gbe: fix ip_summed checksum reporting on rx
  net: fq_codel: Fix off-by-one error
  net: fix the use of this_cpu_ptr
  net: ethernet: cpsw: fix erroneous condition in error check
  net: add a synchronize_net() in netdev_rx_handler_unregister()
  ks8851: Fix interpretation of rxlen field.
  ipv6: don't accept node local multicast traffic from the wire
  ipv6: don't accept multicast traffic with scope 0
  ipv6: fix bad free of addrconf_init_net
  fec: Fix the build as module
  DM9000B: driver initialization upgrade
  atl1e: drop pci-msi support because of packet corruption
  aoe: reserve enough headroom on skbs
  net: fix *_DIAG_MAX constants
  drivers: net: ethernet: cpsw: use netif_wake_queue() while restarting tx queue
  drivers: net: ethernet: davinci_emac: use netif_wake_queue() while restarting tx queue
  bonding: fix disabling of arp_interval and miimon
  ...

Conflicts:
drivers/net/ethernet/ti/cpsw.c
drivers/net/wireless/iwlwifi/dvm/ucode.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>
16 files changed:
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/timer.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/davinci_emac.c
drivers/net/wireless/ath/ath9k/ar9003_calib.c
drivers/net/wireless/iwlwifi/dvm/lib.c
drivers/net/wireless/iwlwifi/dvm/ucode.c
drivers/net/wireless/iwlwifi/pcie/tx.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/main.h
drivers/net/wireless/rtlwifi/usb.c
include/linux/thermal.h
net/bluetooth/sco.c
net/mac80211/mlme.c
net/mac80211/sta_info.c