diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:38:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:38:49 -0500 |
commit | 7c2db36e730ee4facd341679ecb21ee73ba92831 (patch) | |
tree | 75016fba72aaf0581b9263f7fa4c565e6e634f3c /Documentation | |
parent | 8b5628ab83b671f96ac9f174c1bd51c92589fc82 (diff) | |
parent | a47a376f1c025e23e836c0376813c0424de665c2 (diff) |
Merge branch 'akpm' (incoming from Andrew)
Merge misc patches from Andrew Morton:
- Florian has vanished so I appear to have become fbdev maintainer
again :(
- Joel and Mark are distracted to welcome to the new OCFS2 maintainer
- The backlight queue
- Small core kernel changes
- lib/ updates
- The rtc queue
- Various random bits
* akpm: (164 commits)
rtc: rtc-davinci: use devm_*() functions
rtc: rtc-max8997: use devm_request_threaded_irq()
rtc: rtc-max8907: use devm_request_threaded_irq()
rtc: rtc-da9052: use devm_request_threaded_irq()
rtc: rtc-wm831x: use devm_request_threaded_irq()
rtc: rtc-tps80031: use devm_request_threaded_irq()
rtc: rtc-lp8788: use devm_request_threaded_irq()
rtc: rtc-coh901331: use devm_clk_get()
rtc: rtc-vt8500: use devm_*() functions
rtc: rtc-tps6586x: use devm_request_threaded_irq()
rtc: rtc-imxdi: use devm_clk_get()
rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
rtc: rtc-pcf8583: use dev_warn() instead of printk()
rtc: rtc-sun4v: use pr_warn() instead of printk()
rtc: rtc-vr41xx: use dev_info() instead of printk()
rtc: rtc-rs5c313: use pr_err() instead of printk()
rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
rtc: rtc-ds2404: use dev_err() instead of printk()
rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/testing/sysfs-class-bdi | 5 | ||||
-rw-r--r-- | Documentation/backlight/lp855x-driver.txt | 4 | ||||
-rw-r--r-- | Documentation/devicetree/booting-without-of.txt | 2 | ||||
-rw-r--r-- | Documentation/printk-formats.txt | 14 |
4 files changed, 19 insertions, 6 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-bdi b/Documentation/ABI/testing/sysfs-class-bdi index 5f500977b42f..d773d5697cf5 100644 --- a/Documentation/ABI/testing/sysfs-class-bdi +++ b/Documentation/ABI/testing/sysfs-class-bdi | |||
@@ -48,3 +48,8 @@ max_ratio (read-write) | |||
48 | most of the write-back cache. For example in case of an NFS | 48 | most of the write-back cache. For example in case of an NFS |
49 | mount that is prone to get stuck, or a FUSE mount which cannot | 49 | mount that is prone to get stuck, or a FUSE mount which cannot |
50 | be trusted to play fair. | 50 | be trusted to play fair. |
51 | |||
52 | stable_pages_required (read-only) | ||
53 | |||
54 | If set, the backing device requires that all pages comprising a write | ||
55 | request must not be changed until writeout is complete. | ||
diff --git a/Documentation/backlight/lp855x-driver.txt b/Documentation/backlight/lp855x-driver.txt index 1529394cfe8b..18b06ca038ea 100644 --- a/Documentation/backlight/lp855x-driver.txt +++ b/Documentation/backlight/lp855x-driver.txt | |||
@@ -4,7 +4,7 @@ Kernel driver lp855x | |||
4 | Backlight driver for LP855x ICs | 4 | Backlight driver for LP855x ICs |
5 | 5 | ||
6 | Supported chips: | 6 | Supported chips: |
7 | Texas Instruments LP8550, LP8551, LP8552, LP8553 and LP8556 | 7 | Texas Instruments LP8550, LP8551, LP8552, LP8553, LP8556 and LP8557 |
8 | 8 | ||
9 | Author: Milo(Woogyom) Kim <milo.kim@ti.com> | 9 | Author: Milo(Woogyom) Kim <milo.kim@ti.com> |
10 | 10 | ||
@@ -24,7 +24,7 @@ Value : pwm based or register based | |||
24 | 24 | ||
25 | 2) chip_id | 25 | 2) chip_id |
26 | The lp855x chip id. | 26 | The lp855x chip id. |
27 | Value : lp8550/lp8551/lp8552/lp8553/lp8556 | 27 | Value : lp8550/lp8551/lp8552/lp8553/lp8556/lp8557 |
28 | 28 | ||
29 | Platform data for lp855x | 29 | Platform data for lp855x |
30 | ------------------------ | 30 | ------------------------ |
diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt index d4d66757354e..b2fb2f5e1922 100644 --- a/Documentation/devicetree/booting-without-of.txt +++ b/Documentation/devicetree/booting-without-of.txt | |||
@@ -1228,7 +1228,7 @@ hierarchy and routing of interrupts in the hardware. | |||
1228 | The interrupt tree model is fully described in the | 1228 | The interrupt tree model is fully described in the |
1229 | document "Open Firmware Recommended Practice: Interrupt | 1229 | document "Open Firmware Recommended Practice: Interrupt |
1230 | Mapping Version 0.9". The document is available at: | 1230 | Mapping Version 0.9". The document is available at: |
1231 | <http://playground.sun.com/1275/practice>. | 1231 | <http://www.openfirmware.org/ofwg/practice/> |
1232 | 1232 | ||
1233 | 1) interrupts property | 1233 | 1) interrupts property |
1234 | ---------------------- | 1234 | ---------------------- |
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt index 8ffb274367c7..e8a6aa473bab 100644 --- a/Documentation/printk-formats.txt +++ b/Documentation/printk-formats.txt | |||
@@ -53,6 +53,14 @@ Struct Resources: | |||
53 | For printing struct resources. The 'R' and 'r' specifiers result in a | 53 | For printing struct resources. The 'R' and 'r' specifiers result in a |
54 | printed resource with ('R') or without ('r') a decoded flags member. | 54 | printed resource with ('R') or without ('r') a decoded flags member. |
55 | 55 | ||
56 | Physical addresses: | ||
57 | |||
58 | %pa 0x01234567 or 0x0123456789abcdef | ||
59 | |||
60 | For printing a phys_addr_t type (and its derivatives, such as | ||
61 | resource_size_t) which can vary based on build options, regardless of | ||
62 | the width of the CPU data path. Passed by reference. | ||
63 | |||
56 | Raw buffer as a hex string: | 64 | Raw buffer as a hex string: |
57 | %*ph 00 01 02 ... 3f | 65 | %*ph 00 01 02 ... 3f |
58 | %*phC 00:01:02: ... :3f | 66 | %*phC 00:01:02: ... :3f |
@@ -150,9 +158,9 @@ s64 SHOULD be printed with %lld/%llx, (long long): | |||
150 | printk("%lld", (long long)s64_var); | 158 | printk("%lld", (long long)s64_var); |
151 | 159 | ||
152 | If <type> is dependent on a config option for its size (e.g., sector_t, | 160 | If <type> is dependent on a config option for its size (e.g., sector_t, |
153 | blkcnt_t, phys_addr_t, resource_size_t) or is architecture-dependent | 161 | blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a |
154 | for its size (e.g., tcflag_t), use a format specifier of its largest | 162 | format specifier of its largest possible type and explicitly cast to it. |
155 | possible type and explicitly cast to it. Example: | 163 | Example: |
156 | 164 | ||
157 | printk("test: sector number/total blocks: %llu/%llu\n", | 165 | printk("test: sector number/total blocks: %llu/%llu\n", |
158 | (unsigned long long)sector, (unsigned long long)blockcount); | 166 | (unsigned long long)sector, (unsigned long long)blockcount); |