Commit de65d816 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote-tracking branch 'origin/x86/boot' into x86/mm2 



Coming patches to x86/mm2 require the changes and advanced baseline in
x86/boot.

Resolved Conflicts:
	arch/x86/kernel/setup.c
	mm/nobootmem.c

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents 9710f581 5dcd14ec

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ modules.builtin 
# Generated include files

#

include/config

include/linux/version.h

include/generated

arch/*/include/generated

CREDITS

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

S: Germany



N: Avi Kivity

E: avi.kivity@gmail.com

D: Kernel-based Virtual Machine (KVM)

S: Ra'annana, Israel



N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ fault-injection/ 
	- dir with docs about the fault injection capabilities infrastructure.

fb/

	- 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/

	- info on the vfs and the various filesystems that Linux supports.

firmware_class/

Documentation/ABI/README

+0 −3
Original line number 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

	time.  The description of the interface will document the reason

	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/

	This directory contains a list of the old interfaces that have

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

+38 −0
Original line number 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

		and the mouse activates this profile immediately.

		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