review.tizen.org Git - platform/kernel/linux-arm64.git/commit

projects / platform / kernel / linux-arm64.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6c2794a 58c59bc)

author	Jiri Kosina <jkosina@suse.cz>
	Wed, 4 Sep 2013 08:49:39 +0000 (10:49 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 4 Sep 2013 08:49:57 +0000 (10:49 +0200)
commit	efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b
tree	40024adbe77a3d660662e639fd765097133d648c	tree \| snapshot
parent	6c2794a2984f4c17a58117a68703cc7640f01c5a	commit \| diff
parent	58c59bc997d86593f0bea41845885917cf304d22	commit \| diff

Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-logitech-dj.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hidraw.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hidp/core.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;