Jiri Kosina efd15f5f4f 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>		2013-09-04 10:49:57 +02:00
..
core.c	Merge branch 'master' into for-3.12/upstream	2013-09-04 10:49:57 +02:00
hidp.h	HID: Bluetooth: hidp: register HID devices async	2013-05-29 15:19:11 +02:00
Kconfig	HID: Fix the generic Kconfig options	2012-06-25 17:25:00 +02:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sock.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00