summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2015-06-2322-32/+32
|\
| * lpfc: Grammar s/an negative/a negative/Geert Uytterhoeven2015-05-261-6/+6
| * ARM: lib/lib1funcs.S: fix typo s/substractions/subtractions/Antonio Ospite2015-05-261-2/+2
| * cx25821: cx25821-medusa-reg.h: fix 0x0x prefixAntonio Ospite2015-05-261-3/+3
| * lib: crc-itu-t.[ch] fix 0x0x prefix in integer constantsAntonio Ospite2015-05-262-2/+2
| * rapidio: Fix kerneldoc and commentMasanari Iida2015-05-262-2/+2
| * qla4xxx: Fix printk() in qla4_83xx_read_reset_template() and qla4_83xx_pre_lo...Masanari Iida2015-05-262-2/+2
| * treewide: Kconfig: fix wording / spellingMasanari Iida2015-05-263-4/+4
| * usb/serial: fix grammar in Kconfig help text for FTDI_SIOPaul Gortmaker2015-05-261-1/+1
| * megaraid_sas: fix kerneldocGeert Uytterhoeven2015-05-262-2/+2
| * netfilter: ebtables: fix comment grammarGeert Uytterhoeven2015-05-263-3/+3
| * drm/radeon: fix commentGeert Uytterhoeven2015-05-261-2/+2
| * isdn: fix grammar in commentGeert Uytterhoeven2015-05-261-1/+1
| * ARM: KVM: fix commentGeert Uytterhoeven2015-05-262-2/+2
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2015-06-236-38/+79
|\ \
| | \
| | \
| *-. \ Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstrea...Jiri Kosina2015-06-226-33/+66
| |\ \ \
| | | * | livepatch: annotate klp_init() with __initMinfei Huang2015-05-251-1/+1
| | | * | livepatch: introduce patch/func-walking helpersJiri Slaby2015-05-192-9/+15
| | | * | livepatch: make kobject in klp_object statically allocatedMiroslav Benes2015-05-192-7/+17
| | | * | livepatch: Prevent patch inconsistencies if the coming module notifier failsMinfei Huang2015-05-181-11/+18
| | | * | livepatch: match return value to function signatureNicholas Mc Guire2015-05-111-1/+1
| | * | | x86: kaslr: fix build due to missing ALIGN definitionJiri Kosina2015-04-291-0/+1
| | * | | livepatch: x86: make kASLR logic more accurateJiri Kosina2015-04-292-2/+4
| | * | | x86: introduce kaslr_offset()Jiri Kosina2015-04-293-2/+9
| | |/ /
| * / / livepatch: add module locking around kallsyms callsMiroslav Benes2015-06-021-5/+13
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2015-06-2327-625/+1575
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-------------. \ \ Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'f...Jiri Kosina2015-06-228015-172543/+332427
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | HID: wacom: Introduce new 'touch_input' deviceJason Gerecke2015-06-183-101/+139
| | | | | | | | | * | | HID: wacom: Split apart 'wacom_setup_pentouch_input_capabilites'Jason Gerecke2015-06-183-115/+131
| | | | | | | | | * | | HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_typeJason Gerecke2015-06-183-64/+73
| | | | | | | | | * | | HID: wacom: Treat features->device_type values as flagsJason Gerecke2015-06-183-32/+38
| | | | | | | | | * | | HID: wacom: Simplify 'wacom_update_name'Jason Gerecke2015-06-181-11/+14
| | | | | | | | | * | | HID: wacom: Handle failing HID_DG_CONTACTMAX requestsJason Gerecke2015-05-211-2/+9
| | | | | | | | | * | | HID: wacom: Have wacom_{get,set}_report retry on -EAGAIN, not -EPIPEJason Gerecke2015-05-211-2/+10
| | | | | | | | | * | | HID: wacom: Fail probe if HID_GENERIC device has unknown device_typeJason Gerecke2015-05-041-1/+7
| | | | | | | | | * | | HID: wacom: Discover device_type from HID descriptor for all devicesJason Gerecke2015-05-043-14/+23
| | | | | | | | | * | | HID: wacom: Do not add suffix to name of devices with an unknown typeJason Gerecke2015-05-041-5/+8
| | | | | | | | | * | | HID: wacom: retrieve name from HID descriptor for generic devicesPing Cheng2015-04-271-11/+47
| | | | | | | | | * | | HID: wacom: Add support for DTU-1141Aaron Skomra2015-04-231-0/+4
| | | | | | | | | * | | HID: wacom: Simplify check for presence of single-finger touchJason Gerecke2015-04-231-3/+2
| | | | | | | | | * | | HID: wacom: remove unused packet lengthsPing Cheng2015-04-231-6/+0
| | | | | | | | | * | | HID: wacom: move unit and unitExpo initialization to wacom_calculate_resPing Cheng2015-04-231-6/+6
| | | | | | | | | * | | HID: wacom: move all quirks to wacom_setup_device_quirksPing Cheng2015-04-233-40/+31
| | | | | | | | * | | | HID: hid-sony: Fix report descriptor for Navigation ControllerSimon Wood2015-06-181-1/+90
| | | | | | | | * | | | HID: hid-sony: Navigation controller only has 1 LED and no rumbleSimon Wood2015-06-181-8/+33
| | | | | | | | * | | | HID: hid-sony: Add BT support for Navigation ControllerSimon Wood2015-06-182-0/+3
| | | | | | | | * | | | HID: sony: PS Move fix report descriptorSimon Wood2015-06-121-25/+44
| | | | | | | | * | | | HID: sony: PS3 Move enable LEDs and Rumble via BTSimon Wood2015-06-121-6/+5
| | | | | | | | * | | | HID: sony: Add support PS3 Move Battery via BTSimon Wood2015-06-121-4/+11
| | | | | | | | * | | | HID: sony: Add quirk for MOTION_CONTROLLER_BTSimon Wood2015-06-121-3/+5