Merge branch 'kbuild/rc-fixes' into kbuild/kconfig (e3900e74) · Commits · e / devices / android_kernel_samsung_universal8895

.gitignore

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,6 @@
	.o.		.o.
	*.a		*.a
	*.s		*.s
	*.ko.unsigned
	*.ko.stripped
	*.ko.stripped.dig
	*.ko.stripped.sig
	*.ko		*.ko
	*.so		*.so
	*.so.dbg		*.so.dbg
	@@ -64,7 +60,6 @@ modules.builtin
	# Generated include files		# Generated include files
	#		#
	include/config		include/config
	include/linux/version.h
	include/generated		include/generated
	arch/*/include/generated		arch/*/include/generated

	@@ -95,6 +90,4 @@ GTAGS
	extra_certificates		extra_certificates
	signing_key.priv		signing_key.priv
	signing_key.x509		signing_key.x509
	signing_key.x509.keyid
	signing_key.x509.signer
	x509.genkey		x509.genkey

CREDITS

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1823,6 +1823,11 @@ S: Kattreinstr 38
	S: D-64295		S: D-64295
	S: Germany		S: Germany

			N: Avi Kivity
			E: avi.kivity@gmail.com
			D: Kernel-based Virtual Machine (KVM)
			S: Ra'annana, Israel

	N: Andi Kleen		N: Andi Kleen
	E: andi@firstfloor.org		E: andi@firstfloor.org
	U: http://www.halobates.de		U: http://www.halobates.de

Documentation/00-INDEX

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -136,8 +136,6 @@ fault-injection/
	- dir with docs about the fault injection capabilities infrastructure.		- dir with docs about the fault injection capabilities infrastructure.
	fb/		fb/
	- directory with info on the frame buffer graphics abstraction layer.		- directory with info on the frame buffer graphics abstraction layer.
	feature-removal-schedule.txt
	- list of files and features that are going to be removed.
	filesystems/		filesystems/
	- info on the vfs and the various filesystems that Linux supports.		- info on the vfs and the various filesystems that Linux supports.
	firmware_class/		firmware_class/
	@@ -210,6 +208,8 @@ local_ops.txt
	- semantics and behavior of local atomic operations.		- semantics and behavior of local atomic operations.
	lockdep-design.txt		lockdep-design.txt
	- documentation on the runtime locking correctness validator.		- documentation on the runtime locking correctness validator.
			lockup-watchdogs.txt
			- info on soft and hard lockup detectors (aka nmi_watchdog).
	logo.gif		logo.gif
	- full colour GIF image of Linux logo (penguin - Tux).		- full colour GIF image of Linux logo (penguin - Tux).
	logo.txt		logo.txt
	@@ -240,8 +240,6 @@ netlabel/
	- directory with information on the NetLabel subsystem.		- directory with information on the NetLabel subsystem.
	networking/		networking/
	- directory with info on various aspects of networking with Linux.		- directory with info on various aspects of networking with Linux.
	nmi_watchdog.txt
	- info on NMI watchdog for SMP systems.
	nommu-mmap.txt		nommu-mmap.txt
	- documentation about no-mmu memory mapping support.		- documentation about no-mmu memory mapping support.
	numastat.txt		numastat.txt

Documentation/ABI/README

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -36,9 +36,6 @@ The different levels of stability are:
	the kernel, but are marked to be removed at some later point in		the kernel, but are marked to be removed at some later point in
	time. The description of the interface will document the reason		time. The description of the interface will document the reason
	why it is obsolete and when it can be expected to be removed.		why it is obsolete and when it can be expected to be removed.
	The file Documentation/feature-removal-schedule.txt may describe
	some of these interfaces, giving a schedule for when they will
	be removed.

	removed/		removed/
	This directory contains a list of the old interfaces that have		This directory contains a list of the old interfaces that have

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

+38 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,3 +8,41 @@ Description: The integer value of this attribute ranges from 0-4.
	When written, this file sets the number of the startup profile		When written, this file sets the number of the startup profile
	and the mouse activates this profile immediately.		and the mouse activates this profile immediately.
	Please use actual_profile, it does the same thing.		Please use actual_profile, it does the same thing.
			Users: http://roccat.sourceforge.net

			What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/firmware_version
			Date: October 2010
			Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
			Description: When read, this file returns the raw integer version number of the
			firmware reported by the mouse. Using the integer value eases
			further usage in other programs. To receive the real version
			number the decimal point has to be shifted 2 positions to the
			left. E.g. a returned value of 121 means 1.21
			This file is readonly.
			Please read binary attribute info which contains firmware version.
			Users: http://roccat.sourceforge.net

			What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_buttons
			Date: August 2010
			Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
			Description: The mouse can store 5 profiles which can be switched by the
			press of a button. A profile is split in settings and buttons.
			profile_buttons holds information about button layout.
			When read, these files return the respective profile buttons.
			The returned data is 77 bytes in size.
			This file is readonly.
			Write control to select profile and read profile_buttons instead.
			Users: http://roccat.sourceforge.net

			What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_settings
			Date: August 2010
			Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
			Description: The mouse can store 5 profiles which can be switched by the
			press of a button. A profile is split in settings and buttons.
			profile_settings holds information like resolution, sensitivity
			and light effects.
			When read, these files return the respective profile settings.
			The returned data is 43 bytes in size.
			This file is readonly.
			Write control to select profile and read profile_settings instead.
			Users: http://roccat.sourceforge.net
			No newline at end of file