summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file-item.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-12-12 11:15:33 +0100
committerJiri Kosina <jkosina@suse.cz>2014-12-12 11:15:33 +0100
commit019e129f9b2d582e5901c0594427cb4026daa413 (patch)
tree12656ae911d28de821d2ed7ff65c952ed3285cc5 /fs/btrfs/file-item.c
parentMerge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus (diff)
parentHID: make hid_report_len as a static inline function in hid.h (diff)
parentHID: i2c-hid: fix race condition reading reports (diff)
parentHID: lenovo: Don't set EV_REP to avoid repeating mice buttons (diff)
parentHID: logitech-hidpp: disable io in probe error path (diff)
parentHID: add support for MS Surface Pro 3 Type Cover (diff)
parentHID: added missing HID Consumer Page identifiers (diff)
parentHID: rmi: The address of query8 must be calculated based on which query regis... (diff)
parentHID: sony: Add support for the third-party SMK PS3 Bluetooth Remote (diff)
parentHID: wacom: Report input events for each finger on generic devices (diff)
downloadlinux-019e129f9b2d582e5901c0594427cb4026daa413.tar.xz
linux-019e129f9b2d582e5901c0594427cb4026daa413.zip
Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo', 'for-3.19/logitech', 'for-3.19/microsoft', 'for-3.19/plantronics', 'for-3.19/rmi', 'for-3.19/sony' and 'for-3.19/wacom' into for-linus