aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | [media] V4L: soc_camera_platform: remove superfluous soc-camera client operat...Guennadi Liakhovetski2011-11-031-1/+0
| * | | | | [media] V4L: ov772x: remove superfluous soc-camera client operationsGuennadi Liakhovetski2011-11-031-1/+0
| * | | | | [media] V4L: soc-camera: compatible bus-width flagsGuennadi Liakhovetski2011-11-031-6/+6
| * | | | | [media] V4L: soc_camera_platform: support the new mbus-config subdev opsGuennadi Liakhovetski2011-11-031-0/+3
| * | | | | [media] V4L: ov772x: rename macros to not pollute the global namespaceGuennadi Liakhovetski2011-11-031-13/+12
| * | | | | [media] V4L: soc-camera: add helper functions for new bus configuration typeGuennadi Liakhovetski2011-11-032-2/+6
* | | | | | Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-11-041-0/+10
|\ \ \ \ \ \
| * | | | | | dt: add empty of_machine_is_compatibleStephen Warren2011-11-041-0/+5
| * | | | | | Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devic...Grant Likely2011-11-03119-521/+1751
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | dt: add empty of_alias_get_id() for non-dt buildsNicolas Ferre2011-10-291-0/+5
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-11-038-68/+81
|\ \ \ \ \ \ \
| * | | | | | | net: make the tcp and udp file_operations for the /proc stuff constArjan van de Ven2011-11-012-9/+13
| * | | | | | | ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.Krzysztof Wilczynski2011-11-011-1/+1
| * | | | | | | netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.hPablo Neira Ayuso2011-11-014-51/+61
| * | | | | | | ipvs: Remove unused return value of protocol state transitionsSimon Horman2011-11-011-3/+3
| * | | | | | | ipvs: Remove unused parameter from ip_vs_confirm_conntrack()Simon Horman2011-11-011-3/+2