aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 06:11:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 06:11:02 -0400
commit59e52534172d845ebffb0d7e85fc56fb7b857051 (patch)
tree49552e03f1bdb413cd8b5f7542e91770688d7047 /Documentation/ABI
parent73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff)
parent0d89e54c8249645404283436d952afc261a04e1e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits) MAINTAINERS: linux-m32r is moderated for non-subscribers linux@lists.openrisc.net is moderated for non-subscribers Drop default from "DM365 codec select" choice parisc: Kconfig: cleanup Kernel page size default Kconfig: remove redundant CONFIG_ prefix on two symbols cris: remove arch/cris/arch-v32/lib/nand_init.S microblaze: add missing CONFIG_ prefixes h8300: drop puzzling Kconfig dependencies MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers tty: drop superfluous dependency in Kconfig ARM: mxc: fix Kconfig typo 'i.MX51' Fix file references in Kconfig files aic7xxx: fix Kconfig references to READMEs Fix file references in drivers/ide/ thinkpad_acpi: Fix printk typo 'bluestooth' bcmring: drop commented out line in Kconfig btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888' doc: raw1394: Trivial typo fix CIFS: Don't free volume_info->UNC until we are entirely done with it. treewide: Correct spelling of successfully in comments ...
Diffstat (limited to 'Documentation/ABI')
-rw-r--r--Documentation/ABI/removed/o2cb2
-rw-r--r--Documentation/ABI/removed/raw13942
-rw-r--r--Documentation/ABI/testing/sysfs-bus-bcma8
-rw-r--r--Documentation/ABI/testing/sysfs-class-backlight-driver-adp887016
4 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/ABI/removed/o2cb b/Documentation/ABI/removed/o2cb
index 7f5daa465093..20c91adca6d4 100644
--- a/Documentation/ABI/removed/o2cb
+++ b/Documentation/ABI/removed/o2cb
@@ -1,6 +1,6 @@
1What: /sys/o2cb symlink 1What: /sys/o2cb symlink
2Date: May 2011 2Date: May 2011
3KernelVersion: 2.6.40 3KernelVersion: 3.0
4Contact: ocfs2-devel@oss.oracle.com 4Contact: ocfs2-devel@oss.oracle.com
5Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is 5Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
6 removed when new versions of ocfs2-tools which know to look 6 removed when new versions of ocfs2-tools which know to look
diff --git a/Documentation/ABI/removed/raw1394 b/Documentation/ABI/removed/raw1394
index 490aa1efc4ae..ec333e676322 100644
--- a/Documentation/ABI/removed/raw1394
+++ b/Documentation/ABI/removed/raw1394
@@ -5,7 +5,7 @@ Description:
5 /dev/raw1394 was a character device file that allowed low-level 5 /dev/raw1394 was a character device file that allowed low-level
6 access to FireWire buses. Its major drawbacks were its inability 6 access to FireWire buses. Its major drawbacks were its inability
7 to implement sensible device security policies, and its low level 7 to implement sensible device security policies, and its low level
8 of abstraction that required userspace clients do duplicate much 8 of abstraction that required userspace clients to duplicate much
9 of the kernel's ieee1394 core functionality. 9 of the kernel's ieee1394 core functionality.
10 Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of 10 Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
11 firewire-core. 11 firewire-core.
diff --git a/Documentation/ABI/testing/sysfs-bus-bcma b/Documentation/ABI/testing/sysfs-bus-bcma
index 06b62badddd1..721b4aea3020 100644
--- a/Documentation/ABI/testing/sysfs-bus-bcma
+++ b/Documentation/ABI/testing/sysfs-bus-bcma
@@ -1,6 +1,6 @@
1What: /sys/bus/bcma/devices/.../manuf 1What: /sys/bus/bcma/devices/.../manuf
2Date: May 2011 2Date: May 2011
3KernelVersion: 2.6.40 3KernelVersion: 3.0
4Contact: Rafał Miłecki <zajec5@gmail.com> 4Contact: Rafał Miłecki <zajec5@gmail.com>
5Description: 5Description:
6 Each BCMA core has it's manufacturer id. See 6 Each BCMA core has it's manufacturer id. See
@@ -8,7 +8,7 @@ Description:
8 8
9What: /sys/bus/bcma/devices/.../id 9What: /sys/bus/bcma/devices/.../id
10Date: May 2011 10Date: May 2011
11KernelVersion: 2.6.40 11KernelVersion: 3.0
12Contact: Rafał Miłecki <zajec5@gmail.com> 12Contact: Rafał Miłecki <zajec5@gmail.com>
13Description: 13Description:
14 There are a few types of BCMA cores, they can be identified by 14 There are a few types of BCMA cores, they can be identified by
@@ -16,7 +16,7 @@ Description:
16 16
17What: /sys/bus/bcma/devices/.../rev 17What: /sys/bus/bcma/devices/.../rev
18Date: May 2011 18Date: May 2011
19KernelVersion: 2.6.40 19KernelVersion: 3.0
20Contact: Rafał Miłecki <zajec5@gmail.com> 20Contact: Rafał Miłecki <zajec5@gmail.com>
21Description: 21Description:
22 BCMA cores of the same type can still slightly differ depending 22 BCMA cores of the same type can still slightly differ depending
@@ -24,7 +24,7 @@ Description:
24 24
25What: /sys/bus/bcma/devices/.../class 25What: /sys/bus/bcma/devices/.../class
26Date: May 2011 26Date: May 2011
27KernelVersion: 2.6.40 27KernelVersion: 3.0
28Contact: Rafał Miłecki <zajec5@gmail.com> 28Contact: Rafał Miłecki <zajec5@gmail.com>
29Description: 29Description:
30 Each BCMA core is identified by few fields, including class it 30 Each BCMA core is identified by few fields, including class it
diff --git a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
index aa11dbdd794b..4a9c545bda4b 100644
--- a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+++ b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
@@ -4,8 +4,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_max
4What: /sys/class/backlight/<backlight>/l3_office_max 4What: /sys/class/backlight/<backlight>/l3_office_max
5What: /sys/class/backlight/<backlight>/l4_indoor_max 5What: /sys/class/backlight/<backlight>/l4_indoor_max
6What: /sys/class/backlight/<backlight>/l5_dark_max 6What: /sys/class/backlight/<backlight>/l5_dark_max
7Date: Mai 2011 7Date: May 2011
8KernelVersion: 2.6.40 8KernelVersion: 3.0
9Contact: device-drivers-devel@blackfin.uclinux.org 9Contact: device-drivers-devel@blackfin.uclinux.org
10Description: 10Description:
11 Control the maximum brightness for <ambient light zone> 11 Control the maximum brightness for <ambient light zone>
@@ -18,8 +18,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_dim
18What: /sys/class/backlight/<backlight>/l3_office_dim 18What: /sys/class/backlight/<backlight>/l3_office_dim
19What: /sys/class/backlight/<backlight>/l4_indoor_dim 19What: /sys/class/backlight/<backlight>/l4_indoor_dim
20What: /sys/class/backlight/<backlight>/l5_dark_dim 20What: /sys/class/backlight/<backlight>/l5_dark_dim
21Date: Mai 2011 21Date: May 2011
22KernelVersion: 2.6.40 22KernelVersion: 3.0
23Contact: device-drivers-devel@blackfin.uclinux.org 23Contact: device-drivers-devel@blackfin.uclinux.org
24Description: 24Description:
25 Control the dim brightness for <ambient light zone> 25 Control the dim brightness for <ambient light zone>
@@ -29,8 +29,8 @@ Description:
29 this <ambient light zone>. 29 this <ambient light zone>.
30 30
31What: /sys/class/backlight/<backlight>/ambient_light_level 31What: /sys/class/backlight/<backlight>/ambient_light_level
32Date: Mai 2011 32Date: May 2011
33KernelVersion: 2.6.40 33KernelVersion: 3.0
34Contact: device-drivers-devel@blackfin.uclinux.org 34Contact: device-drivers-devel@blackfin.uclinux.org
35Description: 35Description:
36 Get conversion value of the light sensor. 36 Get conversion value of the light sensor.
@@ -39,8 +39,8 @@ Description:
39 8000 (max ambient brightness) 39 8000 (max ambient brightness)
40 40
41What: /sys/class/backlight/<backlight>/ambient_light_zone 41What: /sys/class/backlight/<backlight>/ambient_light_zone
42Date: Mai 2011 42Date: May 2011
43KernelVersion: 2.6.40 43KernelVersion: 3.0
44Contact: device-drivers-devel@blackfin.uclinux.org 44Contact: device-drivers-devel@blackfin.uclinux.org
45Description: 45Description:
46 Get/Set current ambient light zone. Reading returns 46 Get/Set current ambient light zone. Reading returns