summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* omap1: Fix sched_clock implementation when both MPU timer and 32K timer are usedTony Lindgren2011-01-193-2/+61
* omap1: Fix booting for 15xx and 730 with omap1_defconfigTony Lindgren2011-01-197-33/+47
* omap1: Fix sched_clock for the MPU timerTony Lindgren2011-01-181-1/+13
* Merge branch 'fixes_a_2.6.38rc' of git://git.pwsan.com/linux-2.6 into omap-fixesTony Lindgren2011-01-188-12/+43
|\
| * OMAP: PRCM: remove duplicated headersFelipe Balbi2011-01-183-4/+0
| * OMAP4: clockdomain: bypass unimplemented wake-up dependency functions on OMAP4Paul Walmsley2011-01-181-4/+26
| * OMAP: counter_32k: init clocksource as part of machine timer initPaul Walmsley2011-01-184-4/+17
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-01-1738-144/+351
|\ \
| | \
| | \
| | \
| | \
| | \
| | \
| *-----. \ Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-nextRoland Dreier2011-01-1720-60/+297
| |\ \ \ \ \
| | | | | * | IB/srp: Test only once whether iu allocation succeededBart Van Assche2011-01-131-8/+7
| | | | * | | RDMA/nes: Fix incorrect SFP+ link status detection on driver initMaciej Sosnowski2011-01-161-4/+39
| | | | * | | RDMA/nes: Fix SFP+ link down detection issue with switch port disableMaciej Sosnowski2011-01-164-0/+100
| | | | * | | RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE eventsMaciej Sosnowski2011-01-164-9/+83
| | | | * | | RDMA/nes: Fix bonding on iw_nesMaciej Sosnowski2011-01-162-6/+26
| | | | |/ /
| | | * / / IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)John L. Burr2011-01-125-6/+7
| | | |/ /
| | * | | IB/mlx4: Handle protocol field in multicast tableAleksey Senin2011-01-124-21/+27
| | * | | mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)Roland Dreier2011-01-124-6/+8
| | |/ /
| * | | RDMA: Update workqueue usageTejun Heo2011-01-1713-50/+39
| * | | RDMA: Use vzalloc() to replace vmalloc()+memset(0)Joe Perches2011-01-128-34/+15
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-01-1729-623/+2490
|\ \ \
| * | | Btrfs: forced readonly mounts on errorsliubo2011-01-177-2/+523
| * | | btrfs: Require CAP_SYS_ADMIN for filesystem rebalanceBen Hutchings2011-01-161-0/+4
| * | | Btrfs: don't warn if we get ENOSPC in btrfs_block_rsv_checkJosef Bacik2011-01-161-5/+0
| * | | btrfs: Fix memory leak in btrfs_read_fs_root_no_radix()Tsutomu Itoh2011-01-161-0/+1
| * | | btrfs: check NULL or notTsutomu Itoh2011-01-163-0/+16
| * | | btrfs: Don't pass NULL ptr to func that may deref it.Jesper Juhl2011-01-161-0/+2
| * | | btrfs: mount failure return value fixDave Young2011-01-162-4/+8
| * | | btrfs: Mem leak in btrfs_get_acl()Jesper Juhl2011-01-161-1/+3
| * | | btrfs: fix wrong free space information of btrfsMiao Xie2011-01-165-7/+286
| * | | btrfs: make the chunk allocator utilize the devices betterMiao Xie2011-01-162-103/+300
| * | | btrfs: restructure find_free_dev_extent()Miao Xie2011-01-162-68/+91
| * | | btrfs: fix wrong calculation of stripe sizeMiao Xie2011-01-161-2/+8
| * | | btrfs: try to reclaim some space when chunk allocation failsMiao Xie2011-01-161-2/+7
| * | | btrfs: fix wrong data space statisticsMiao Xie2011-01-161-4/+3
| * | | fs/btrfs: Fix build of ctreeStefan Schmidt2011-01-161-0/+1
| * | | Merge branch 'lzo-support' of git://repo.or.cz/linux-btrfs-devel into btrfs-38Chris Mason2011-01-1620-385/+1051
| |\ \ \
| | * | | btrfs: Extract duplicate decompress codeLi Zefan2010-12-224-194/+115
| | * | | btrfs: Allow to specify compress method when defragLi Zefan2010-12-222-2/+26
| | * | | btrfs: Add lzo compression supportLi Zefan2010-12-228-8/+527
| | * | | btrfs: Allow to add new compression algorithmLi Zefan2010-12-2215-282/+473
| | * | | btrfs: Fix error handling in zlibLi Zefan2010-12-221-0/+8
| | * | | btrfs: Fix bugs in zlib workspaceLi Zefan2010-12-221-2/+5
| * | | | Merge branch 'readonly-snapshots' of git://repo.or.cz/linux-btrfs-devel into ...Chris Mason2011-01-167-49/+195
| |\ \ \ \
| | * | | | Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctlsLi Zefan2010-12-232-0/+85
| | * | | | Btrfs: Add readonly snapshots supportLi Zefan2010-12-237-10/+75
| | * | | | Btrfs: Refactor btrfs_ioctl_snap_create()Li Zefan2010-12-231-44/+40
| | |/ / /
| * / / / Btrfs: fix off by one while setting block groups readonlyChris Mason2011-01-041-1/+2
| |/ / /
* | | | Revert "mm: simplify code of swap.c"Linus Torvalds2011-01-171-54/+47
* | | | Revert "mm: batch activate_page() to reduce lock contention"Linus Torvalds2011-01-173-92/+13
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecr...Linus Torvalds2011-01-178-80/+83
|\ \ \ \