Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (df2071bd) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+12 −7

Original line number	Diff line number	Diff line
		@@ -34,13 +34,18 @@ modules.builtin
		#
		# Top-level generic files
		#
		tags
		TAGS
		vmlinux
		vmlinuz
		System.map
		Module.markers
		Module.symvers
		/tags
		/TAGS
		/linux
		/vmlinux
		/vmlinuz
		/System.map
		/Module.markers
		/Module.symvers

		#
		# git files that we don't want to ignore even it they are dot-files
		#
		!.gitignore
		!.mailmap

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/system/node/nodeX
		Date: October 2002
		Contact: Linux Memory Management list <linux-mm@kvack.org>
		Description:
		When CONFIG_NUMA is enabled, this is a directory containing
		information on node X such as what CPUs are local to the
		node.

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ Description:
		match the driver to the device. For example:
		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id

		What: /sys/bus/usb/device/.../avoid_reset
		What: /sys/bus/usb/device/.../avoid_reset_quirk
		Date: December 2009
		Contact: Oliver Neukum <oliver@neukum.org>
		Description: