Commit c08319a9 authored by Steve French's avatar Steve French
Browse files

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents bfa0d75a 4706df3d

Documentation/crypto/api-intro.txt

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ CAST5 algorithm contributors: 


TEA/XTEA algorithm contributors:

  Aaron Grothe

  Michael Ringe



Khazad algorithm contributors:

  Aaron Grothe

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Diff line number Diff line
@@ -102,16 +102,6 @@ Who: Jody McIntyre <scjody@steamballoon.com> 


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



What:	register_serial/unregister_serial

When:	September 2005

Why:	This interface does not allow serial ports to be registered against

	a struct device, and as such does not allow correct power management

	of such ports.  8250-based ports should use serial8250_register_port

	and serial8250_unregister_port, or platform devices instead.

Who:	Russell King <rmk@arm.linux.org.uk>



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



What:	i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid

When:	November 2005

Files:	drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c

Documentation/filesystems/proc.txt

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ Table 1-1: Process specific entries in /proc 
 statm   Process memory status information              

 status  Process status in human readable form          

 wchan   If CONFIG_KALLSYMS is set, a pre-decoded wchan

 smaps	 Extension based on maps, presenting the rss size for each mapped file

..............................................................................



For example, to get the status information of a process, all you have to do is

Documentation/filesystems/sysfs.txt

+14 −14
Original line number Diff line number Diff line
@@ -99,14 +99,14 @@ struct device_attribute dev_attr_##_name = { \ 


For example, declaring



static DEVICE_ATTR(foo,0644,show_foo,store_foo);

static DEVICE_ATTR(foo, S_IWUSR | S_IRUGO, show_foo, store_foo);



is equivalent to doing:



static struct device_attribute dev_attr_foo = {

       .attr	= {

		.name = "foo",

		.mode = 0644,

		.mode = S_IWUSR | S_IRUGO,

	},

	.show = show_foo,

	.store = store_foo,
@@ -216,13 +216,13 @@ A very simple (and naive) implementation of a device attribute is: 


static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)

{

        return sprintf(buf,"%s\n",dev->name);

	return snprintf(buf, PAGE_SIZE, "%s\n", dev->name);

}



static ssize_t store_name(struct device * dev, const char * buf)

{

	sscanf(buf, "%20s", dev->name);

	return strlen(buf);

	return strnlen(buf, PAGE_SIZE);

}



static DEVICE_ATTR(name, S_IRUGO, show_name, store_name);

Documentation/hwmon/lm78

+1 −6
Original line number Diff line number Diff line
@@ -2,16 +2,11 @@ Kernel driver lm78 
==================



Supported chips:

  * National Semiconductor LM78

  * National Semiconductor LM78 / LM78-J

    Prefix: 'lm78'

    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/

  * National Semiconductor LM78-J

    Prefix: 'lm78-j'

    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/

  * National Semiconductor LM79

    Prefix: 'lm79'

    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)