aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAge
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-11-14
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-11-12
| |\
| | * gianfar: Do not call device_set_wakeup_enable() under a spinlockRafael J. Wysocki2010-11-12
| | * axnet_cs: fix resume problem for some Ax88790 chipKen Kawasaki2010-11-12
| | * cxgb4vf: add call to Firmware to reset VF State.Casey Leedom2010-11-12
| | * cxgb4vf: Fail open if link_start() fails.Casey Leedom2010-11-12
| | * cxgb4vf: flesh out PCI Device ID Table ...Casey Leedom2010-11-12
| | * cxgb4vf: fix some errors in Gather List to skb conversionCasey Leedom2010-11-12
| | * cxgb4vf: fix bug in Generic Receive OffloadCasey Leedom2010-11-12
| | * cxgb4vf: don't implement trivial (and incorrect) ndo_select_queue()Casey Leedom2010-11-12
| | * ixgbe: Look inside vlan when determining offload protocol.Hao Zheng2010-11-12
| | * bnx2x: Look inside vlan when determining checksum proto.Hao Zheng2010-11-12
| | * virtio-net: init link state correctlyJason Wang2010-11-12
| | * ucc_geth: Fix deadlockJoakim Tjernlund2010-11-12
| | * ucc_geth: Do not bring the whole IF down when TX failure.Joakim Tjernlund2010-11-12
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-11-11
| | |\
| | | * iwlwifi: dont use pci_dev before it being assignWey-Yi Guy2010-11-09
| | | * Bluetooth: Add MacBookAir3,1(2) supportEdgar (gimli) Hucek2010-11-08
| | | * Bluetooth: Enable USB autosuspend by default on btusbMatthew Garrett2010-11-08
| | | * ath9k_hw: Fix memory leak on ath9k_hw_rf_alloc_ext_banks failureRajkumar Manoharan2010-11-08
| | | * ath9k_htc: Fix probe failure if CONFIG_USB_DEBUG enabledRajkumar Manoharan2010-11-08
| | | * ath9k_htc: Add support for device ID 3346Haitao Zhang2010-11-08
| | | * ath9k_hw: Fix AR9280 surprise removal during frequent idle on/offVasanthakumar Thiagarajan2010-11-08
| | | * libertas: terminate scan when stopping interfaceDaniel Drake2010-11-08
| | | * ath9k: check old power mode before clearing cycle countersFelix Fietkau2010-11-08
| | | * carl9170: usbid table updatesChristian Lamparter2010-11-08
| | | * ath9k: Fix a DMA latency issue for Intel Pinetrail platforms.Vivek Natarajan2010-11-08
| | | * ath9k: Avoid HW opmode overridden on monitor mode changesRajkumar Manoharan2010-11-08
| | | * libipw: fix proc entry removalLinus Torvalds2010-11-08
| | * | r8169: fix sleeping while holding spinlock.françois romieu2010-11-09
| | * | r8169: revert "Handle rxfifo errors on 8168 chips"françois romieu2010-11-09
| * | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-11-12
| |\ \ \
| | * | | drivers/ata/pata_octeon_cf.c: delete double assignmentJulia Lawall2010-11-12
| | * | | pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE testTejun Heo2010-11-12
| | * | | libata: fix NULL sdev dereference race in atapi_qc_complete()Tejun Heo2010-11-12
| * | | | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-11-12
| |\ \ \ \
| | * \ \ \ Staging: Merge 'tidspbridge-2.6.37-rc1' into staging-linusGreg Kroah-Hartman2010-11-11
| | |\ \ \ \
| | | * | | | Revert "staging: tidspbridge: replace iommu custom for opensource implementat...Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - fix mmufault support"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - remove hw directory"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - move all iommu related code to a new file"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - remove reserved memory clean up"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - remove dmm custom module"Felipe Contreras2010-11-10
| | | * | | | Revert "staging: tidspbridge - update Kconfig to select IOMMU module"Felipe Contreras2010-11-10
| | | * | | | staging: tidspbridge: hardcode SCM macros while fix is upstreamedFelipe Contreras2010-11-10