Merge commit 'v2.6.34-rc6' (5306293c) · Commits · e / devices / android_kernel_oneplus_sm7250

.gitignore

+12 −8

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

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -160,7 +160,7 @@ Description:
	match the driver to the device. For example:		match the driver to the device. For example:
	# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id		# 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		Date: December 2009
	Contact: Oliver Neukum <oliver@neukum.org>		Contact: Oliver Neukum <oliver@neukum.org>
	Description:		Description: