summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2008-07-1853-3826/+492
|\
| * Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-07-171-4/+6
| |\
| | * configfs: Allow ->make_item() and ->make_group() to return detailed errors.Joel Becker2008-07-141-4/+6
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drz...Linus Torvalds2008-07-161-13/+7
| |\ \
| | * | mmc,sdio: helper function for transfer paddingPierre Ossman2008-07-151-13/+7
| * | | Merge commit 'origin/master'Benjamin Herrenschmidt2008-07-1627-1613/+167
| |\ \ \
| | * \ \ Merge branch 'core/rcu' into core/rcu-for-linusIngo Molnar2008-07-151-1/+1
| | |\ \ \
| | | * \ \ Merge branch 'linus' into core/rcuIngo Molnar2008-07-1144-182/+270
| | | |\ \ \
| | | * \ \ \ Merge branch 'linus' into core/rcuIngo Molnar2008-06-2320-294/+265
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'linus' into core/rcuIngo Molnar2008-06-16111-934/+1539
| | | |\ \ \ \ \
| | | * | | | | | rcu: split list.h and move rcu-protected lists into rculist.hFranck Bui-Huu2008-05-191-1/+1
| | * | | | | | | mlx4_core: Use MOD_STAT_CFG command to get minimal page sizeVladimir Sokolovsky2008-07-143-0/+41
| | * | | | | | | RDMA/cxgb3: Fixes for zero STagSteve Wise2008-07-141-1/+1
| | * | | | | | | IB/mlx4: Add support for blocking multicast loopback packetsRon Livne2008-07-141-4/+13
| | * | | | | | | RDMA/cxgb3: Add support for protocol statisticsSteve Wise2008-07-142-0/+8
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6Linus Torvalds2008-07-1419-1607/+103
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitDavid Woodhouse2008-07-1419-1607/+103
| | | |\ \ \ \ \ \
| | | | * | | | | | kaweth: use request_firmware()David Woodhouse2008-07-102-574/+26
| | | | * | | | | | smctr: use request_firmware()David Woodhouse2008-07-103-1001/+35
| | | | * | | | | | cxgb3: treat firmware data as constDavid Woodhouse2008-07-102-5/+7
| | | | * | | | | | irda-usb: treat firmware data as constDavid Woodhouse2008-07-101-6/+6
| | | | * | | | | | atmel: treat firmware data as constDavid Woodhouse2008-07-101-3/+3
| | | | * | | | | | p54: treat firmware data as constDavid Woodhouse2008-07-101-2/+3
| | | | * | | | | | rt2x00: treat firmware data as constDavid Woodhouse2008-07-104-8/+8
| | | | * | | | | | zd1201: treat firmware data as constDavid Woodhouse2008-07-101-1/+1
| | | | * | | | | | myri10ge: treat firmware data as constDavid Woodhouse2008-07-101-2/+9
| | | | * | | | | | libertas: treat firmware data as constDavid Woodhouse2008-07-103-5/+5
| | | | | |_|_|/ / | | | | |/| | | |
| * | | | | | | | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-buildBenjamin Herrenschmidt2008-07-158-38/+68
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-143-26/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ [ARM] Merge most of the PXA work for initial mergeRussell King2008-07-141-24/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin settingDmitry Baryshkov2008-07-091-9/+0
| | | | * | | | | | | [ARM] 5144/1: pxaficp_ir: cleanup includesDmitry Baryshkov2008-07-091-15/+0
| | | | | |_|/ / / / | | | | |/| | | | |
| | | | | | | | | |
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | *---------. \ \ \ \ \ \ Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'o...Russell King2008-07-1036-157/+201
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | | | | | | * | | | | | [ARM] rpc: etherh: fix unused variable warningRussell King2008-07-031-1/+1
| | | | * | | | | | | | | | [ARM] 5130/4: Support for the at91sam9g20sedji gaouaou2008-07-101-1/+1
| | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | * | | | | | | | | | | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2008-07-143-10/+27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge commit 'v2.6.26' into bkl-removalJonathan Corbet2008-07-14159-1409/+2136
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | | * | | | | | | | | | tun: fasync BKL pushdownJonathan Corbet2008-07-021-4/+7
| | | * | | | | | | | | | net-tun: BKL pushdownArnd Bergmann2008-07-021-0/+2
| | | * | | | | | | | | | Add a bunch of cycle_kernel_lock() callsJonathan Corbet2008-06-201-1/+2
| | | * | | | | | | | | | Add "no BKL needed" comments to several driversJonathan Corbet2008-06-201-0/+1
| | | * | | | | | | | | | cosa: cdev lock_kernel() pushdownJonathan Corbet2008-05-181-6/+16
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6Linus Torvalds2008-07-141-0/+37
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | macb: Basic suspend/resume supportHaavard Skinnemoen2008-07-021-0/+37
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2008-07-141-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | xen: Avoid allocations causing swap activity on the resume pathIan Campbell2008-07-031-2/+2
| | | | |_|_|_|/ / / / | | | |/| | | | | | |
| * | | | | | | | | | ibm_newemac: Add MII mode support to the EMAC RGMII bridge.Grant Erickson2008-07-151-0/+6
| * | | | | | | | | | Merge commit 'origin/HEAD' into test-mergeBenjamin Herrenschmidt2008-07-1453-190/+341
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | ibm_newemac: Parameterize EMAC Multicast Match HandlingGrant Erickson2008-07-094-65/+232
| * | | | | | | | | | drivers/net: Use linux/of_{device,platform}.h instead of asmStephen Rothwell2008-06-306-6/+6
OpenPOWER on IntegriCloud