aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-2618-150/+505
|\
| *---------. Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '...Roland Dreier2011-05-2518-147/+500
| |\ \ \ \ \ \
| | | | | | | * IB/uverbs: Add devnode method to set path/modeRoland Dreier2011-05-231-0/+8
| | | | | | * | IB/srp: Fix integer -> pointer cast warningsRoland Dreier2011-05-231-2/+2
| | | | | | |/
| | | | | * | RDMA/cma: Save PID of ID's ownerNir Muchtar2011-05-251-0/+6
| | | | | * | RDMA/cma: Add support for netlink statistics exportNir Muchtar2011-05-251-0/+99
| | | | | * | RDMA/cma: Pass QP type into rdma_create_id()Sean Hefty2011-05-253-24/+40
| | | | | * | RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h>Nir Muchtar2011-05-251-90/+80
| | | | | * | RDMA: Add netlink infrastructureRoland Dreier2011-05-205-3/+205
| | | | | * | RDMA: Add error handling to ib_core_init()Nir Muchtar2011-05-201-3/+11
| | | | | |/
| | | | * | RDMA/nes: Add a check for strict_strtoul()Liu Yuan2011-05-241-1/+3
| | | | * | IB: Add devnode methods to cm_class and umad_classRoland Dreier2011-05-232-0/+15
| | | | * | IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP requiredIra Weiny2011-05-231-0/+7
| | | | |/
| | | * / RDMA/cxgb4: Use completion objects for event blockingSteve Wise2011-05-241-13/+5
| | | |/
| | * / RDMA/cxgb3: Don't post zero-byte read if endpoint is going awaySteve Wise2011-05-243-13/+21
| | |/
| * / RDMA/ucma: Add .nodename/.mode to tell userspace where to create device nodeRoland Dreier2011-05-231-3/+5
| |/
* | Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-05-269-159/+96
|\ \
| * | spi/amba-pl022: work in polling or interrupt mode if pl022_dma_probe failsViresh Kumar2011-05-201-5/+6
| * | spi/spi_s3c24xx: Use spi_bitbang_stop instead of spi_unregister_master in s3c...Axel Lin2011-05-201-1/+1
| * | spi/spi_nuc900: Use spi_bitbang_stop instead of spi_unregister_master in nuc9...Axel Lin2011-05-201-1/+1
| * | spi/spi_tegra: use spi_unregister_master() instead of spi_master_put()Axel Lin2011-05-201-1/+1
| * | spi/spi_sh: use spi_unregister_master instead of spi_master_put in remove pathAxel Lin2011-05-201-1/+1
| * | spi: Use void pointers for data in simple SPI I/O operationsMark Brown2011-05-201-2/+2
| * | spi/pl022: use cpu_relax in the busy loopLinus Walleij2011-05-201-0/+1
| * | spi/pl022: mark driver non-experimentalLinus Walleij2011-05-201-2/+2
| * | spi/pl022: timeout on polled transfer v2Magnus Templing2011-05-201-8/+15
| * | Merge commit 'v2.6.39' into spi/nextGrant Likely2011-05-201831-8747/+8837
| |\ \
| * | | spi/dw_spi: improve the interrupt mode with the batch opsAlek Du2011-03-301-47/+16
| * | | spi/dw_spi: change poll mode transfer from byte ops to batch opsAlek Du2011-03-301-23/+48
| * | | spi/dw_spi: remove the un-necessary flush()Alek Du2011-03-301-14/+1
| * | | spi/dw_spi: unify the low level read/write routinesFeng Tang2011-03-302-79/+26
* | | | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-05-262-193/+0
|\ \ \ \
| * \ \ \ Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux...Tony Lindgren2011-05-2485-296/+708
| |\ \ \ \ | | | |/ / | | |/| |
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-nextTony Lindgren2011-05-172-193/+0
| |\ \ \ \ \ \
| | | * | | | | omap: Remove support for omap2evmTony Lindgren2011-05-132-193/+0
| | | |/ / / /
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm...Linus Torvalds2011-05-262-0/+265
|\ \ \ \ \ \ \
| * | | | | | | xen: cleancache shim to Xen Transcendent MemoryDan Magenheimer2011-05-262-0/+265
| | |_|_|/ / / | |/| | | | |
* | | | | | | video: mb862xx: udelay need linux/delay.hStephen Rothwell2011-05-251-0/+1
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-25141-1041/+1448
|\ \ \ \ \ \ \
| * | | | | | | bonding: documentation and code cleanup for resend_igmpFlavio Leitner2011-05-252-10/+12
| * | | | | | | bonding: prevent deadlock on slave store with alb mode (v3)Neil Horman2011-05-253-16/+10
| * | | | | | | Add Fujitsu 1000base-SX PCI ID to tg3Meelis Roos2011-05-251-0/+1
| * | | | | | | bnx2x: protect sequence increment with mutexDmitry Kravkov2011-05-251-1/+2
| * | | | | | | isdn: netjet - blacklist Digium TDM400PPrarit Bhargava2011-05-251-0/+6
| * | | | | | | via-velocity: don't annotate MAC registers as packedUlrich Hecht2011-05-251-1/+1
| * | | | | | | xen: netfront: hold RTNL when updating features.Ian Campbell2011-05-251-0/+2
| * | | | | | | Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2011-05-25127-874/+1353
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next...John W. Linville2011-05-24127-874/+1353
| | |\ \ \ \ \ \ \
| | | * | | | | | | iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabledWey-Yi Guy2011-05-241-2/+2
| | | * | | | | | | ath9k: use PS wakeup before REG_READMohammed Shafi Shajakhan2011-05-191-1/+1