summaryrefslogtreecommitdiffstats
path: root/sound/parisc/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-25 12:08:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-25 12:08:41 -0700
commit03e8f644868f147e021e8660346890e731c2e435 (patch)
tree18d356289c92ec6802085936ed824150d12a3241 /sound/parisc/Makefile
parent101688f534fd322520678a184fdfedc7a21741fc (diff)
parent2b9dbef272b63c561aab0a5be34fd428f7b710f5 (diff)
downloadop-kernel-dev-03e8f644868f147e021e8660346890e731c2e435.zip
op-kernel-dev-03e8f644868f147e021e8660346890e731c2e435.tar.gz
Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "This is an assorted set I've been queuing up: Jeff Mahoney tracked down a tricky one where we ended up starting IO on the wrong mapping for special files in btrfs_evict_inode. A few people reported this one on the list. Filipe found (and provided a test for) a difficult bug in reading compressed extents, and Josef fixed up some quota record keeping with snapshot deletion. Chandan killed off an accounting bug during DIO that lead to WARN_ONs as we freed inodes" * 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: keep dropped roots in cache until transaction commit Btrfs: Direct I/O: Fix space accounting btrfs: skip waiting on ordered range for special files Btrfs: fix read corruption of compressed and shared extents Btrfs: remove unnecessary locking of cleaner_mutex to avoid deadlock Btrfs: don't initialize a space info as full to prevent ENOSPC
Diffstat (limited to 'sound/parisc/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud