summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2011-11-044-14/+37
|\
| * Merge branch 'samsung_dma' into nextVinod Koul2011-09-211-5/+1
| |\
| | * DMA: PL330: Update PL330 DMA API driverBoojin Kim2011-09-141-5/+1
| * | dmaengine/amba-pl08x: Add support for sg len greater than one for slave trans...Viresh Kumar2011-09-191-6/+16
| * | serial: sh-sci: don't filter on DMA device, use only channel IDGuennadi Liakhovetski2011-09-191-2/+0
| |/
| * Merge branch 'next' into v3.1-rc4Vinod Koul2011-09-022-4/+23
| |\
| | * dmaengine/amba-pl08x: Pass flow controller information with slave channel dataViresh Kumar2011-08-251-0/+4
| | * dmaengine/amba-pl08x: Get rid of pl08x_pre_boundary()Viresh Kumar2011-08-251-2/+0
| | * dmaengine/amba-pl08x: Complete doc comment for struct pl08x_txdViresh Kumar2011-08-251-0/+8
| | * dmaengine: remove struct scatterlist for headerVinod Koul2011-08-161-2/+0
| | * dmaengine: add helper function for slave_singleVinod Koul2011-08-081-0/+11
* | | Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-blockLinus Torvalds2011-11-043-2/+41
|\ \ \
| * \ \ Merge branch 'stable/for-jens-3.2' of git://oss.oracle.com/git/kwilk/xen into...Jens Axboe2011-10-201-0/+36
| |\ \ \
| | * | | xen-blkfront: add BLKIF_OP_DISCARD and discard request structLi Dongyang2011-10-131-0/+36
| | | |/ | | |/|
| * | | loop: always allow userspace partitions and optionally support automatic scan...Kay Sievers2011-08-231-0/+1
| * | | block: add GENHD_FL_NO_PART_SCANTejun Heo2011-08-231-2/+4
| |/ /
* | | Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-blockLinus Torvalds2011-11-045-39/+27
|\ \ \
| * \ \ Merge branch 'for-linus' into for-3.2/coreJens Axboe2011-10-241-1/+0
| |\ \ \
| | * | | loop: remove the incorrect write_begin/write_end shortcutChristoph Hellwig2011-10-171-1/+0
| * | | | block: Remove the control of complete cpu from bio.Tao Ma2011-10-242-15/+4
| * | | | block: drop @tsk from attempt_plug_merge() and explain sync rulesTejun Heo2011-10-191-0/+6
| * | | | block: move blk_throtl prototypes to block/blk.hTejun Heo2011-10-191-14/+0
| * | | | Merge branch 'v3.1-rc10' into for-3.2/coreJens Axboe2011-10-1959-140/+389
| |\| | |
| * | | | block: document blk-plugSuresh Jayaraman2011-09-211-9/+15
| * | | | block: remove support for bio remapping from ->make_requestChristoph Hellwig2011-09-121-2/+2
| * | | | block: rename __make_request() to blk_queue_bio()Jens Axboe2011-09-121-1/+1
| * | | | block: export __make_requestChristoph Hellwig2011-09-121-0/+2
| | |/ / | |/| |
* | | | Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-11-043-0/+4
|\ \ \ \
| * \ \ \ Merge branch 'osd-devel' into nfs-for-nextTrond Myklebust2011-11-02391-2400/+10853
| |\ \ \ \
| * | | | | nfs4: serialize layoutcommitPeng Tao2011-10-311-0/+1
| * | | | | NFSd: call svc rpcbind cleanup explicitlyStanislav Kinsbursky2011-10-251-0/+1
| * | | | | SUNRPC: introduce svc helpers for prepairing rpcbind infrastructureStanislav Kinsbursky2011-10-251-0/+2
* | | | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-11-049-105/+166
|\ \ \ \ \ \
| * | | | | | [media] vb2: add vb2_get_unmapped_area in vb2 coreScott Jiang2011-11-031-0/+7
| * | | | | | [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensorSylwester Nawrocki2011-11-031-0/+51
| * | | | | | [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY controlSylwester Nawrocki2011-11-031-0/+1
| * | | | | | [media] V4L: soc-camera: make (almost) all client drivers re-usable outside o...Guennadi Liakhovetski2011-11-031-3/+3
| * | | | | | [media] V4L: add .g_std() core V4L2 subdevice operationGuennadi Liakhovetski2011-11-031-0/+1
| * | | | | | [media] V4L: dynamically allocate video_device nodes in subdevicesGuennadi Liakhovetski2011-11-031-2/+2
| * | | | | | [media] V4L: mt9m001, mt9v022: use internally cached pixel codeGuennadi Liakhovetski2011-11-031-5/+0
| * | | | | | [media] V4L: soc-camera: start removing struct soc_camera_device from client ...Guennadi Liakhovetski2011-11-031-4/+21
| * | | | | | [media] V4L: docbook documentation for struct v4l2_create_buffersGuennadi Liakhovetski2011-11-031-3/+11
| * | | | | | [media] soc_camera: remove the now obsolete struct soc_camera_opsHans Verkuil2011-11-031-18/+0
| * | | | | | [media] sh_mobile_ceu_camera: implement the control handlerHans Verkuil2011-11-031-4/+0
| * | | | | | [media] soc_camera: add control handler supportHans Verkuil2011-11-031-0/+2
| * | | | | | [media] V4L: vb2: add support for buffers of different sizes on a single queueGuennadi Liakhovetski2011-11-031-12/+23
| * | | | | | [media] V4L: vb2: prepare to support multi-size buffersGuennadi Liakhovetski2011-11-031-3/+3
| * | | | | | [media] V4L: add two new ioctl()s for multi-size videobuffer managementGuennadi Liakhovetski2011-11-032-0/+20
| * | | | | | [media] V4L: add a new videobuf2 buffer state VB2_BUF_STATE_PREPAREDGuennadi Liakhovetski2011-11-031-0/+2
| * | | | | | [media] V4L: soc-camera: remove soc-camera client bus-param operations and su...Guennadi Liakhovetski2011-11-031-44/+8