tree 2ad585653cbbd2a8776a6634733193819ea4b9fa
parent b2b98ea87a8d82d1100200324ace989970a92423
parent 94037efe81d8e734e28f12b98f76a6e8005495d6
parent 875e36f8a2ce6cfc2010af6c91fb5351bd530d48
parent 61ebca937f2609e66fe6749f8f5df57ff387e2eb
parent 274be3eb653c421d68514684024c6d915c94b728
author Jiri Kosina <jkosina@suse.cz> 1390401614 +0100
committer Jiri Kosina <jkosina@suse.cz> 1390401614 +0100

Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus