summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-09-132-0/+2
|\
| * of: Fix missing includes - ll_temacMichal Simek2010-09-012-0/+2
* | ipheth: remove incorrect devtype to WWANDan Williams2010-09-091-6/+1
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2010-09-0876-807/+616
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-09-079-9/+12
| |\ \ | | |/ | |/|
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-287-36/+63
| |\ \
| * \ \ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-08-281-1/+1
| |\ \ \
| | * | | Input: sysrq - drop tty argument from sysrq ops handlersDmitry Torokhov2010-08-191-1/+1
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-2341-186/+1973
| |\ \ \ \
| * | | | | ipheth: add support for iPhone 4Jens Axboe2010-08-231-0/+5
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1710-16/+48
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | pcmcia: xirc2ps_cs bugfixDominik Brodowski2010-08-131-1/+1
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1319-180/+160
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Linus Torvalds2010-08-124-15/+77
| |\ \ \ \ \ \
| | * | | | | | param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes.Rusty Russell2010-08-111-2/+30
| | * | | | | | param: lock myri10ge_fw_name against sysfs changes.Rusty Russell2010-08-111-13/+41
| | * | | | | | param: simple locking for sysfs-writable charp parametersRusty Russell2010-08-112-0/+6
| * | | | | | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-1241-168/+168
| |\ \ \ \ \ \ \
| | * | | | | | | of/sparc: fix build regression from of_device changesGrant Likely2010-08-081-1/+1
| | * | | | | | | of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-0641-167/+167
| * | | | | | | | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2010-08-112-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | IXP4xx: Make mdio_bus struct static in the Ethernet driver.Krzysztof Hałasa2010-05-271-1/+1
| | * | | | | | | | IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.Krzysztof Hałasa2010-05-271-1/+1
| * | | | | | | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-08-111-4/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branches 'master' and 'devel' into for-linusRussell King2010-08-101-4/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev...Russell King2010-08-061-4/+2
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | | * | | | | | | net/irda/sh_irda: Modify clk_get lookupsKuninori Morimoto2010-08-041-4/+2
| * | | | | | | | | | drivers/net/wireless/libertas/cfg.c: needs sched.hAndrew Morton2010-08-111-0/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-0951-339/+927
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-0619-497/+311
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | pcmcia: do not request windows if you don't need toDominik Brodowski2010-08-031-36/+1
| | * | | | | | | | | | pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski2010-08-033-11/+1
| | * | | | | | | | | | pcmcia: remove memreq_tDominik Brodowski2010-08-038-54/+19
| | * | | | | | | | | | pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-0319-205/+195
| | * | | | | | | | | | pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski2010-08-0317-53/+50
| | * | | | | | | | | | pcmcia: use pcmica_{read,write}_config_byteDominik Brodowski2010-08-035-114/+49
| | * | | | | | | | | | pcmcia: remove cs_types.hDominik Brodowski2010-07-3019-31/+3
| * | | | | | | | | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2010-08-062-24/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | PCI: change device runtime PM settings for probe and removeAlan Stern2010-07-302-24/+8
| * | | | | | | | | | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-0510-33/+31
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | of/address: Clean up function declarationsGrant Likely2010-08-012-1/+2
| | * | | | | | | | | | | of/platform: remove all of_bus_type and of_platform_bus_type referencesGrant Likely2010-07-247-15/+15
| | * | | | | | | | | | | Merge commit 'v2.6.35-rc6' into devicetree/nextGrant Likely2010-07-2459-241/+414
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | niu: always include of_device.hRandy Dunlap2010-07-051-3/+0
| | * | | | | | | | | | | of: kill struct of_deviceGrant Likely2010-06-281-2/+2
| | * | | | | | | | | | | sparc/of: Move of_device fields into struct pdev_archdataGrant Likely2010-06-286-12/+12
| * | | | | | | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-08-052-38/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'gcl/next' into nextBenjamin Herrenschmidt2010-08-047-12/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Remove REDWOOD_[456] config options and conditional codeChristian Dietrich2010-07-262-38/+1
| * | | | | | | | | | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-08-052-25/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud