summaryrefslogtreecommitdiff
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-012-13/+19
|\
| * Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-222-2/+2
| |\
| | * ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| | * ARM: netx: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| * | Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux ...Olof Johansson2012-09-201-11/+17
| |\ \
| | * | net: pxaficp_ir: add irq resourcesRob Herring2012-09-141-11/+17
| | |/
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-011-2/+2
|\ \ \
| * \ \ Merge branch 'cleanup/__iomem' into next/cleanupOlof Johansson2012-09-221-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | net: seeq: use __iomem pointers for MMIOArnd Bergmann2012-09-191-2/+2
| | |/
| * | Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-09-2042-223/+581
| |\ \
| * \ \ Merge branch 'depends/tty-omap-serial' into next/cleanupOlof Johansson2012-09-163-25/+26
| |\ \ \
* | \ \ \ Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-10-011-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-09-2142-223/+581
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into ...Olof Johansson2012-09-131-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | can: mpc5xxx_can: make data used as *of_device_id.data constArnd Bergmann2012-09-111-2/+2
* | | | | | Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/ttyLinus Torvalds2012-10-013-25/+26
|\ \ \ \ \ \
| * \ \ \ \ \ Merge 3.6-rc6 into tty-nextGreg Kroah-Hartman2012-09-1674-332/+735
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge 3.6-rc3 into tty-nextGreg Kroah-Hartman2012-08-2781-583/+467
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | TTY: use tty_port_register_deviceJiri Slaby2012-08-131-3/+4
| * | | | | Merge tty-next into 3.6-rc1Greg Kroah-Hartman2012-08-06719-37513/+40170
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | 8250: three way resolve of the 8250 diffsAlan Cox2012-07-171-10/+12
| * | | | | tty: move the termios object into the ttyAlan Cox2012-07-162-12/+10
* | | | | | Merge tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pciLinus Torvalds2012-10-0134-237/+106
|\ \ \ \ \ \
| * \ \ \ \ \ Merge commit 'v3.6-rc5' into nextBjorn Helgaas2012-09-13111-687/+621
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'pci/stephen-const' into nextBjorn Helgaas2012-09-1223-23/+23
| |\ \ \ \ \ \
| | * | | | | | netdev: make pci_error_handlers constStephen Hemminger2012-09-0723-23/+23
| | | |_|/ / / | | |/| | | |
| * | | | | | rtlwifi: Use PCI Express Capability accessorsJiang Liu2012-08-231-5/+3
| * | | | | | iwlwifi: Use PCI Express Capability accessorsJiang Liu2012-08-231-5/+2
| * | | | | | iwlegacy: Use PCI Express Capability accessorsJiang Liu2012-08-231-3/+1
| * | | | | | ath9k: Use PCI Express Capability accessorsJiang Liu2012-08-231-15/+6
| * | | | | | atl1c: Use PCI Express Capability accessorsJiang Liu2012-08-231-1/+1
| * | | | | | cxgb4: Use PCI Express Capability accessorsJiang Liu2012-08-232-13/+3
| * | | | | | cxgb3: Use PCI Express Capability accessorsJiang Liu2012-08-231-14/+8
| * | | | | | myri10ge: Use PCI Express Capability accessorsJiang Liu2012-08-231-23/+8
| * | | | | | niu: Use PCI Express Capability accessorsJiang Liu2012-08-231-12/+7
| * | | | | | mlx4: Use PCI Express Capability accessorsJiang Liu2012-08-231-4/+4
| * | | | | | vxge: Use PCI Express Capability accessorsJiang Liu2012-08-231-2/+2
| * | | | | | igb: Use PCI Express Capability accessorsJiang Liu2012-08-231-10/+2
| * | | | | | e1000e: Use PCI Express Capability accessorsJiang Liu2012-08-231-19/+8
| * | | | | | tg3: Use PCI Express Capability accessorsJiang Liu2012-08-231-37/+13
| * | | | | | bnx2x: Use PCI Express Capability accessorsJiang Liu2012-08-231-20/+5
| * | | | | | r8169: Preserve other Device Control bits when setting NOSNOOP_ENBjorn Helgaas2012-08-231-2/+2
| * | | | | | r8169: Use PCI Express Capability accessorsJiang Liu2012-08-231-35/+9
| * | | | | | PCI: Introduce pci_pcie_type(dev) to replace pci_dev->pcie_typeYijing Wang2012-08-232-2/+2
| |/ / / / /
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-10-016-11/+11
|\ \ \ \ \ \
| * | | | | | treewide: fix comment/printk/variable typosAnatol Pomozov2012-09-015-9/+9
| * | | | | | b43: Kconfig: drop unknown symbol 'BRCMSMAC_MODULE'Paul Bolle2012-09-011-2/+2
* | | | | | | netdev: octeon: fix return value check in octeon_mgmt_init_phy()Wei Yongjun2012-09-281-3/+1
* | | | | | | qlcnic: Fix scheduling while atomic bugNarendra K2012-09-271-2/+2
* | | | | | | bnx2: Clean up remaining iounmapNeil Horman2012-09-271-1/+1