Linus Torvalds 24c3047095 Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs ... * 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (28 commits) pnfsblock: write_pagelist handle zero invalid extents pnfsblock: note written INVAL areas for layoutcommit pnfsblock: bl_write_pagelist pnfsblock: bl_read_pagelist pnfsblock: cleanup_layoutcommit pnfsblock: encode_layoutcommit pnfsblock: merge rw extents pnfsblock: add extent manipulation functions pnfsblock: bl_find_get_extent pnfsblock: xdr decode pnfs_block_layout4 pnfsblock: call and parse getdevicelist pnfsblock: merge extents pnfsblock: lseg alloc and free pnfsblock: remove device operations pnfsblock: add device operations pnfsblock: basic extent code pnfsblock: use pageio_ops api pnfsblock: add blocklayout Kconfig option, Makefile, and stubs pnfs: cleanup_layoutcommit pnfs: ask for layout_blksize and save it in nfs_server ...		2011-07-31 06:26:50 -10:00
..
acpi	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
asm-generic	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
crypto	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
drm	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
keys	encrypted-keys: add key format support	2011-06-27 09:10:45 -04:00
linux	Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs	2011-07-31 06:26:50 -10:00
math-emu	…
media	[media] V4L: initial driver for ov5642 CMOS sensor	2011-07-27 17:56:09 -03:00
mtd	UBI: fix minor stylistic issues	2011-04-14 11:34:41 +03:00
net	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-07-31 06:23:08 -10:00
rdma	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
rxrpc	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-07-30 08:36:02 -10:00
sound	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-07-30 00:08:53 -07:00
target	target: Bump version to v4.1.0-rc1-ml	2011-07-22 09:37:49 +00:00
trace	Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2011-07-29 23:33:40 -07:00
video	Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-24 15:49:57 +09:00
xen	xen/balloon: memory hotplug support for Xen balloon driver	2011-07-25 20:57:08 -07:00
Kbuild	…