Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion',... (a177ba3b) · Commits · 戴 / test

.gitignore

+9 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,10 @@
		# subdirectories here. Add them in the ".gitignore" file
		# in that subdirectory instead.
		#
		# NOTE! Please use 'git-ls-files -i --exclude-standard'
		# command after changing this file, to see if there are
		# any tracked files which get ignored after the change.
		#
		# Normal rules
		#
		.*
		@@ -18,19 +22,21 @@
		*.lst
		*.symtypes
		*.order
		*.elf
		*.bin
		*.gz

		#
		# Top-level generic files
		#
		tags
		TAGS
		vmlinux*
		!vmlinux.lds.S
		!vmlinux.lds.h
		vmlinux
		System.map
		Module.markers
		Module.symvers
		!.gitignore
		!.mailmap

		#
		# Generated include files

+9 −0

Original line number	Diff line number	Diff line
		@@ -312,3 +312,12 @@ When: 2.6.26
		Why: Implementation became generic; users should now include
		linux/semaphore.h instead.
		Who: Matthew Wilcox <willy@linux.intel.com>

		---------------------------

		What: CONFIG_THERMAL_HWMON
		When: January 2009
		Why: This option was introduced just to allow older lm-sensors userspace
		to keep working over the upgrade to 2.6.26. At the scheduled time of
		removal fixed lm-sensors (2.x or 3.x) should be readily available.
		Who: Rene Herman <rene.herman@gmail.com>

+14 −4

Original line number	Diff line number	Diff line
		@@ -25,12 +25,23 @@ routines, and should be zero-initialized except for fields with data you
		provide. A client structure holds device-specific information like the
		driver model device node, and its I2C address.

		/* iff driver uses driver model ("new style") binding model: */

		static struct i2c_device_id foo_idtable[] = {
		{ "foo", my_id_for_foo },
		{ "bar", my_id_for_bar },
		{ }
		};

		MODULE_DEVICE_TABLE(i2c, foo_idtable);

		static struct i2c_driver foo_driver = {
		.driver = {
		.name = "foo",
		},

		/* iff driver uses driver model ("new style") binding model: */
		.id_table = foo_ids,
		.probe = foo_probe,
		.remove = foo_remove,

		@@ -173,10 +184,9 @@ handle may be used during foo_probe(). If foo_probe() reports success
		(zero not a negative status code) it may save the handle and use it until
		foo_remove() returns. That binding model is used by most Linux drivers.

		Drivers match devices when i2c_client.driver_name and the driver name are
		the same; this approach is used in several other busses that don't have
		device typing support in the hardware. The driver and module name should
		match, so hotplug/coldplug mechanisms will modprobe the driver.
		The probe function is called when an entry in the id_table name field
		matches the device's name. It is passed the entry that was matched so
		the driver knows which one in the table matched.


		Device Creation (Standard driver model)

+5 −0

Original line number	Diff line number	Diff line
		@@ -1208,6 +1208,11 @@ and is between 256 and 4096 characters. It is defined in the file
		mtdparts= [MTD]
		See drivers/mtd/cmdlinepart.c.

		mtdset= [ARM]
		ARM/S3C2412 JIVE boot control

		See arch/arm/mach-s3c2412/mach-jive.c

		mtouchusb.raw_coordinates=
		[HW] Make the MicroTouch USB driver use raw coordinates
		('y', default) or cooked coordinates ('n')

+4 −8

Original line number	Diff line number	Diff line
		@@ -81,23 +81,23 @@ inet_peer_minttl - INTEGER
		Minimum time-to-live of entries. Should be enough to cover fragment
		time-to-live on the reassembling side. This minimum time-to-live is
		guaranteed if the pool size is less than inet_peer_threshold.
		Measured in jiffies(1).
		Measured in seconds.

		inet_peer_maxttl - INTEGER
		Maximum time-to-live of entries. Unused entries will expire after
		this period of time if there is no memory pressure on the pool (i.e.
		when the number of entries in the pool is very small).
		Measured in jiffies(1).
		Measured in seconds.

		inet_peer_gc_mintime - INTEGER
		Minimum interval between garbage collection passes. This interval is
		in effect under high memory pressure on the pool.
		Measured in jiffies(1).
		Measured in seconds.

		inet_peer_gc_maxtime - INTEGER
		Minimum interval between garbage collection passes. This interval is
		in effect under low (or absent) memory pressure on the pool.
		Measured in jiffies(1).
		Measured in seconds.

		TCP variables:

		@@ -794,10 +794,6 @@ tag - INTEGER
		Allows you to write a number, which can be used as required.
		Default value is 0.

		(1) Jiffie: internal timeunit for the kernel. On the i386 1/100s, on the
		Alpha 1/1024s. See the HZ define in /usr/include/asm/param.h for the exact
		value on your system.

		Alexey Kuznetsov.
		kuznet@ms2.inr.ac.ru