summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-114645-6319/+13577
|\
| * Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-04-114636-6193/+13245
| |\
| | * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-04-094-7/+7
| | |\
| | | *---. Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linusRoland Dreier2010-04-093-7/+6
| | | |\ \ \
| | | | | | * RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()Chien Tung2010-04-071-5/+4
| | | | | * | IB/mlx4: Check correct variable for allocation failureDan Carpenter2010-04-071-1/+1
| | | | | |/
| | | | * / IB/cm: Fix device_create() return value checkJani Nikula2010-03-311-1/+1
| | | | |/
| | | * / RDMA/cm: Set num_paths when manually assigning path recordsSean Hefty2010-04-071-0/+1
| | | |/
| | * | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2010-04-098-26/+55
| | |\ \
| | | * | [S390] Update default configuration.Martin Schwidefsky2010-04-091-10/+30
| | | * | [S390] nss: add missing .previous statement to asm functionHeiko Carstens2010-04-091-1/+2
| | | * | [S390] increase default size of vmalloc areaMartin Schwidefsky2010-04-091-3/+3
| | | * | [S390] s390: disable change bit overrideChristian Borntraeger2010-04-091-8/+3
| | | * | [S390] fix io_return critical section cleanupMartin Schwidefsky2010-04-092-2/+14
| | | * | [S390] sclp_async: potential buffer overflowDan Carpenter2010-04-091-1/+1
| | | * | [S390] arch/s390/kernel: Add missing unlockJulia Lawall2010-04-091-1/+2
| | * | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-04-0934-178/+475
| | |\ \ \
| | | * | | cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatchDivyesh Shah2010-04-091-2/+5
| | | * | | loop: Update mtime when writing using aopsNikanth Karthikesan2010-04-081-0/+2
| | | * | | block: expose the statistics in blkio.time and blkio.sectors for the root cgroupRicky Benitez2010-04-051-0/+5
| | | * | | backing-dev: Handle class_create() failureAnton Blanchard2010-04-021-0/+3
| | | * | | Block: Fix block/elevator.c elevator_get() off-by-one errorwzt.wzt@gmail.com2010-04-021-1/+1
| | | * | | drbd: lc_element_by_index() never returns NULLPhilipp Reisner2010-04-021-1/+1
| | | * | | cciss: unlock on error pathDan Carpenter2010-04-021-0/+1
| | | * | | cfq-iosched: Do not merge queues of BE and IDLE classesDivyesh Shah2010-03-251-0/+2
| | | * | | cfq-iosched: Add additional blktrace log messages in CFQ for easier debuggingDivyesh Shah2010-03-251-3/+13
| | | * | | i2o: Remove the dangerous kobj_to_i2o_device macroFerenc Wagner2010-03-241-1/+0
| | | * | | block: remove 16 bytes of padding from struct request on 64bitsRichard Kennedy2010-03-191-5/+6
| | | * | | Merge branch 'master' into for-linusJens Axboe2010-03-191756-49229/+63811
| | | |\ \ \
| | | * | | | cfq-iosched: fix a kbuild regressionShaohua Li2010-03-191-5/+6
| | | * | | | block: make CONFIG_BLK_CGROUP visibleLi Zefan2010-03-161-1/+2
| | | * | | | Remove GENHD_FL_DRIVERFSNeilBrown2010-03-162-2/+2
| | | * | | | block: Export max number of segments and max segment size in sysfsMartin K. Petersen2010-03-151-0/+25
| | | * | | | block: Finalize conversion of block limits functionsMartin K. Petersen2010-03-153-28/+2
| | | * | | | block: Fix overrun in lcm() and move it to libMartin K. Petersen2010-03-154-11/+25
| | | * | | | vfs: improve writeback_inodes_wb()Edward Shishkin2010-03-122-60/+76
| | | * | | | paride: fix off-by-one testRoel Kluin2010-03-123-6/+6
| | | * | | | drbd: fix al-to-on-disk-bitmap for 4k logical_block_sizeLars Ellenberg2010-03-111-4/+13
| | | * | | | drbd: Renamed overwrite_peer to primary_forcePhilipp Reisner2010-03-112-2/+2
| | | * | | | drbd: Forcing primary should also work for Consistent disks [Bugz 266]Philipp Reisner2010-03-111-2/+2
| | | * | | | drbd: Make sure we do not send state updates during an empty resync [Bugz 271]Philipp Reisner2010-03-111-2/+1
| | | * | | | drbd: Reduce the time an empty resync takes usuallyPhilipp Reisner2010-03-113-3/+12
| | | * | | | drbd: add missing drbd command names to avoid <NULL> in error messagesLars Ellenberg2010-03-111-0/+3
| | | * | | | drbd_disconnect: grab meta.socket mutex as wellLars Ellenberg2010-03-112-3/+4
| | | * | | | fix unit of rs_same_csums accountingLars Ellenberg2010-03-111-1/+2
| | | * | | | drbd: fix broken state change after split-brain attach while connectedLars Ellenberg2010-03-111-1/+6
| | | * | | | drbd: fix NULL pointer dereference on 4k hard sect sizeLars Ellenberg2010-03-111-19/+19
| | | * | | | drbd: --dry-run option for drbdsetup net ( drbdadm -- --dry-run connect <res> )Philipp Reisner2010-03-115-6/+43
| | | * | | | block: drbd: Convert semaphore to mutexThomas Gleixner2010-03-111-5/+5
| | | * | | | Add DocBook documentation for the block tracepoints.William Cohen2010-03-092-0/+177