diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:41:15 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:41:15 +0200 |
| commit | 05f6d02521d4c7a656c5135d6d81c345ce531ac0 (patch) | |
| tree | 3a4a14301c32f3cf6863e050e24cdd0628c87fc2 /Makefile | |
| parent | 43faadfe96d3f049f4ae2c4090d2e57b9aafb995 (diff) | |
| parent | feb6faf1e5d46276c5430e36ffb4a6f62bf8d55b (diff) | |
| parent | ee20fe2386e4390285cfbd52b9a67596d1f1e894 (diff) | |
| parent | a485923efbb83056b7fb79e4fd2fee05c990ad5e (diff) | |
| parent | 7af05e73cd204efad74fc9c48e5a1b1484d76f68 (diff) | |
| parent | b832da56024b33e6c7f06f766c59d90e4f377a9b (diff) | |
| parent | 2c6e0277e1eab3df5db81c59e408b7b1c14b1b72 (diff) | |
| parent | f097deef59a60109648efd48f6c9fe7f56966938 (diff) | |
| parent | 2e701a359ac2833381e5d226802bed8fd1946238 (diff) | |
| parent | 8fec02a73e31407e14986fca67dab48d4f777f0e (diff) | |
| parent | b4bf2120d40b96552326a6606d5fb90e2ab04841 (diff) | |
Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic-merge', 'for-4.1/i2c-hid', 'for-4.1/kconfig-drop-expert-dependency', 'for-4.1/logitech', 'for-4.1/multitouch', 'for-4.1/rmi', 'for-4.1/sony', 'for-4.1/upstream' and 'for-4.1/wacom' into for-linus