diff options
| author | Linus Torvalds | 2014-06-04 16:47:03 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-04 16:47:03 +0200 |
| commit | 1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf (patch) | |
| tree | 74f7837b131703a10e4e8a2143339c5aa0bf47d2 /fs/ceph/locks.c | |
| parent | clocksource: versatile: Use sched_clock_register() (diff) | |
| parent | firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk (diff) | |
| download | kernel-qcow2-linux-1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf.tar.gz kernel-qcow2-linux-1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf.tar.xz kernel-qcow2-linux-1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf.zip | |
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 into next
Pull firewire updates from Stefan Richter:
"IEEE 1394 (FireWire) subsystem changes: One optimization for some VIA
controllers, one fix, one kconfig brushup"
* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk
firewire: Use COMPILE_TEST for build testing
firewire: net: fix NULL derefencing in fwnet_probe()
Diffstat (limited to 'fs/ceph/locks.c')
0 files changed, 0 insertions, 0 deletions