summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2013-09-0915-108/+555
|\
| * ARM: init: add support for reserved memory defined by device treeMarek Szyprowski2013-08-271-0/+3
| * drivers: of: add initialization code for dma reserved memoryMarek Szyprowski2013-08-276-0/+368
| * drivers: of: add function to scan fdt nodes given by pathMarek Szyprowski2013-08-272-0/+79
| * drivers: dma-contiguous: clean source code and prepare for device treeMarek Szyprowski2013-08-276-108/+105
| * Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-nextMarek Szyprowski2013-07-156-22/+34
| |\
* | \ Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2013-09-097-16/+48
|\ \ \
| * | | virtio_pci: pm: Use CONFIG_PM_SLEEP instead of CONFIG_PMAaron Lu2013-09-091-2/+2
| * | | lguest: fix GPF in guest when using gdb.Rusty Russell2013-09-061-0/+7
| * | | lguest: fix guest kernel stack overflow when TF bit set.Rusty Russell2013-09-061-0/+10
| * | | lguest: fix BUG_ON() in invalid guest page table.Rusty Russell2013-09-061-1/+3
| * | | virtio: console: prevent use-after-free of port name in port unplugAmit Shah2013-08-091-2/+1
| * | | Merge branch 'master' into virtio-nextRusty Russell2013-08-091382-101075/+14795
| |\ \ \
| * | | | virtio: console: cleanup an error messageDan Carpenter2013-07-301-4/+2
| * | | | virtio: console: fix locking around send_sigio_to_port()Amit Shah2013-07-291-3/+5
| * | | | virtio: console: add locking in port unplug pathAmit Shah2013-07-291-0/+2
| * | | | virtio: console: add locks around buffer removal in port unplug pathAmit Shah2013-07-291-2/+6
| * | | | tools/lguest: offer VIRTIO_F_ANY_LAYOUT for net device.Rusty Russell2013-07-151-0/+6
| * | | | virtio tools: add .gitignoreRamkumar Ramachandra2013-07-151-0/+3
| * | | | lguest: Point to the right directory for the lguest launcherHolger Hans Peter Freyther2013-07-151-2/+1
| | |/ / | |/| |
* | | | Merge tag 'vfio-v3.12-rc0' of git://github.com/awilliam/linux-vfioLinus Torvalds2013-09-097-28/+421
|\ \ \ \
| * | | | vfio: fix documentationZi Shen Lim2013-09-051-4/+4
| * | | | vfio-pci: PCI hot reset interfaceAlex Williamson2013-09-042-1/+323
| * | | | Merge remote branch 'origin/master' into next-mergeAlex Williamson2013-09-043081-93450/+231358
| |\ \ \ \
| * | | | | vfio-pci: Test for extended config spaceAlex Williamson2013-09-041-3/+8
| * | | | | vfio-pci: Use fdget() rather than eventfd_fget()Alex Williamson2013-08-281-19/+16
| * | | | | vfio: Add O_CLOEXEC flag to vfio device fdAlex Williamson2013-08-221-1/+1
| * | | | | vfio: use get_unused_fd_flags(0) instead of get_unused_fd()Yann Droneaud2013-08-221-1/+1
| * | | | | vfio: add external user supportAlexey Kardashevskiy2013-08-052-0/+69
* | | | | | Merge tag 'nfs-for-3.12-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-09-0951-974/+4504
|\ \ \ \ \ \
| * | | | | | NFSv4: use mach cred for SECINFO_NO_NAME w/ integrityWeston Andros Adamson2013-09-071-4/+37
| * | | | | | NFS: nfs_compare_super shouldn't check the auth flavour unless 'sec=' was setTrond Myklebust2013-09-071-2/+15
| * | | | | | NFSv4: Allow security autonegotiation for submountsTrond Myklebust2013-09-072-5/+19
| * | | | | | NFSv4: Disallow security negotiation for lookups when 'sec=' is specifiedTrond Myklebust2013-09-071-1/+3
| * | | | | | NFSv4: Fix security auto-negotiationTrond Myklebust2013-09-076-18/+30
| * | | | | | NFS: Clean up nfs_parse_security_flavors()Trond Myklebust2013-09-071-12/+13
| * | | | | | NFS: Clean up the auth flavour array messTrond Myklebust2013-09-072-13/+28
| * | | | | | NFSv4.1 Use MDS auth flavor for data server connectionAndy Adamson2013-09-064-8/+146
| * | | | | | NFS: Don't check lock owner compatability unless file is locked (part 2)Trond Myklebust2013-09-061-6/+16
| * | | | | | NFS: Don't check lock owner compatibility in writes unless file is lockedTrond Myklebust2013-09-051-1/+1
| * | | | | | nfs4: Map NFS4ERR_WRONG_CRED to EPERMWeston Andros Adamson2013-09-051-0/+1
| * | | | | | nfs4.1: Add SP4_MACH_CRED write and commit supportWeston Andros Adamson2013-09-054-9/+59
| * | | | | | nfs4.1: Add SP4_MACH_CRED stateid supportWeston Andros Adamson2013-09-052-2/+18
| * | | | | | nfs4.1: Add SP4_MACH_CRED secinfo supportWeston Andros Adamson2013-09-052-1/+14
| * | | | | | nfs4.1: Add SP4_MACH_CRED cleanup supportWeston Andros Adamson2013-09-052-1/+19
| * | | | | | nfs4.1: Add state protection handlerWeston Andros Adamson2013-09-051-0/+35
| * | | | | | nfs4.1: Minimal SP4_MACH_CRED implementationWeston Andros Adamson2013-09-054-17/+211
| * | | | | | SUNRPC: Replace pointer values with task->tk_pid and rpc_clnt->cl_clidTrond Myklebust2013-09-051-24/+26
| * | | | | | SUNRPC: Add an identifier for struct rpc_clntTrond Myklebust2013-09-052-0/+26
| * | | | | | SUNRPC: Ensure rpc_task->tk_pid is available for tracepointsTrond Myklebust2013-09-042-2/+2
OpenPOWER on IntegriCloud