aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/libxfs/xfs_attr_remote.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-30 11:03:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-30 11:03:04 -0700
commitdbe08116b87cdc2217f11a78b5b70e29068b7efd (patch)
treecf1829d864da4661f020645f04e50c11f444e1a6 /fs/xfs/libxfs/xfs_attr_remote.c
parentMerge tag 'hwmon-for-linus-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff)
parentRevert "Input: zforce - don't overwrite the stack" (diff)
downloadlinux-dev-dbe08116b87cdc2217f11a78b5b70e29068b7efd.tar.xz
linux-dev-dbe08116b87cdc2217f11a78b5b70e29068b7efd.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "The main change is support for keyboards and touchpads found in 2015 editions of Macbooks" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Revert "Input: zforce - don't overwrite the stack" Input: bcm5974 - add support for the 2015 Macbook Pro HID: apple: Add support for the 2015 Macbook Pro Input: bcm5974 - prepare for a new trackpad generation Input: synaptics - dump ext10 capabilities as well
Diffstat (limited to 'fs/xfs/libxfs/xfs_attr_remote.c')
0 files changed, 0 insertions, 0 deletions