summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-05-236-6459/+0Star
|\
| * Merge 3.4-rc5 into staging-nextGreg Kroah-Hartman2012-05-026-6459/+0Star
| |\
| | * NET: pc300, move to staging as it is brokenJiri Slaby2012-04-136-6459/+0Star
* | | Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-05-231-61/+44Star
|\ \ \
| * \ \ Merge 3.4-rc3 into tty-nextGreg Kroah-Hartman2012-04-197-37/+35Star
| |\ \ \
| * | | | TTY: hso, use tty from tty_portJiri Slaby2012-04-091-27/+13Star
| * | | | TTY: hso, remove tty NULL checks fro tty->opsJiri Slaby2012-04-091-17/+10Star
| * | | | TTY: hso, add tty_portJiri Slaby2012-04-091-12/+13
| * | | | TTY: hso, free tty_driverJiri Slaby2012-04-091-4/+8
| * | | | TTY: hso, do not set TTY MAGICJiri Slaby2012-04-091-1/+0Star
| | |_|/ | |/| |
* | | | Merge tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-05-2349-110/+206
|\ \ \ \
| * | | | brcm80211: Fix compile error for .disable_hub_initiated_lpm.Sarah Sharp2012-05-211-1/+1
| * | | | USB: Disable hub-initiated LPM for comms devices.Sarah Sharp2012-05-1944-2/+46
| * | | | Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/...Greg Kroah-Hartman2012-05-1722-89/+172
| |\ \ \ \
| * \ \ \ \ Merge 3.4-rc6 into usb-nextGreg Kroah-Hartman2012-05-0774-395/+610
| |\ \ \ \ \
| * | | | | | USB: at76c50x-usb.c: remove err() usageGreg Kroah-Hartman2012-04-251-1/+1
| * | | | | | USB: stir4200.c: remove err() usageGreg Kroah-Hartman2012-04-251-3/+3
| * | | | | | USB: ksdazzle-sir.c: remove err() usageGreg Kroah-Hartman2012-04-251-18/+28
| * | | | | | USB: ks959-sir.c: remove err() usageGreg Kroah-Hartman2012-04-251-12/+19
| * | | | | | USB: kingsun-sir.c: remove err() usageGreg Kroah-Hartman2012-04-251-16/+26
| * | | | | | USB: irda-usb.c: remove err() usageGreg Kroah-Hartman2012-04-251-1/+1
| * | | | | | USB: rtl8150.c: remove err() usageGreg Kroah-Hartman2012-04-251-7/+8
| * | | | | | USB: kaweth.c: remove err() usageGreg Kroah-Hartman2012-04-251-26/+37
| * | | | | | USB: ipheth.c: remove err() usageGreg Kroah-Hartman2012-04-251-13/+21
| * | | | | | USB: catc.c: remove err() usageGreg Kroah-Hartman2012-04-251-10/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-222-0/+15
|\ \ \ \ \ \
| * | | | | | can: flexcan: adopt pinctrl supportShawn Guo2012-05-121-0/+6
| * | | | | | net: fec: adopt pinctrl supportShawn Guo2012-05-121-0/+9
| | |_|_|_|/ | |/| | | |
* | | | | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-21/+50
|\ \ \ \ \ \
| * | | | | | Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dtArnd Bergmann2012-05-1433-126/+209
| |\| | | | |
| * | | | | | net: Add device tree support to LPC32xxRoland Stigge2012-04-221-21/+50
| | |/ / / / | |/| | | |
* | | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'clps711x/cleanup' into next/cleanupArnd Bergmann2012-05-131-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | ARM: clps711x: Combine header files into one for clps711x-targetsAlexander Shiyan2012-05-131-2/+2
| | | |/ / / | | |/| | |
* | | | | | Merge tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2012-05-2219-33/+852
|\ \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *---. \ \ \ \ \ Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'o...Roland Dreier2012-05-2119-33/+853
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | | | * | | | | be2net: Add functionality to support RoCE driverParav Pandit2012-05-087-15/+375
| | | | * | | | | be2net: Add function to issue mailbox cmd on MQParav Pandit2012-05-081-0/+39
| | |_|/ / / / / | |/| | | | | |
| | | * | | | | mlx4_core: Change bitmap allocator to work in round-robin fashionJack Morgenstein2012-05-141-3/+0Star
| | | * | | | | mlx4_core: Add second capabilities flags fieldShlomo Pongratz2012-05-083-0/+33
| | |/ / / / / | |/| | | | |
| | * | | | | cxgb4: DB Drop Recovery for RDMA and LLD queuesVipul Pandya2012-05-186-42/+280
| | * | | | | cxgb4: Common platform specific changes for DB Drop RecoveryVipul Pandya2012-05-182-11/+61
| | * | | | | cxgb4: Detect DB FULL events and notify RDMA ULDVipul Pandya2012-05-185-0/+103
| |/ / / / /
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2012-05-212-11/+8Star
|\ \ \ \ \ \
| * | | | | | net/ariadne: Improve debug printsGeert Uytterhoeven2012-04-221-4/+4
| * | | | | | m68k/atari: Change VME irq numbers from unsigned long to unsigned intGeert Uytterhoeven2012-04-221-7/+4Star
| | |_|/ / / | |/| | | |
* | | | | | drivers/net/stmmac: seq_file fix memory leakDjalal Harouni2012-05-211-2/+2
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-05-212-1/+7
|\ \ \ \ \ \
| * | | | | | e1000: Prevent reset task killing itself.Tushar Dave2012-05-181-1/+5
| * | | | | | virtio_net: invoke softirqs after __napi_scheduleMichael S. Tsirkin2012-05-171-0/+2