---

yaml
---
r: 335485
b: refs/heads/master
c: 31370f7
h: refs/heads/master
i:
  335483: 7c38178
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976bacef40c66443173283cc02b537e37a62c981
+refs/heads/master: 31370f75de4b641f47204899549d2a533cd42738

trunk/Documentation/devicetree/bindings/arm/atmel-at91.txt

@@ -8,7 +8,7 @@ PIT Timer required properties:
   shared across all System Controller members.
 
 TC/TCLIB Timer required properties:
-- compatible: Should be "atmel,<chip>-tcb".
+- compatible: Should be "atmel,<chip>-pit".
   <chip> can be "at91rm9200" or "at91sam9x5"
 - reg: Should contain registers location and length
 - interrupts: Should contain all interrupts for the TC block

trunk/Documentation/firmware_class/README

@@ -18,40 +18,32 @@
  High level behavior (mixed):
  ============================
 
- 1), kernel(driver):
-	- calls request_firmware(&fw_entry, $FIRMWARE, device)
-	- kernel searchs the fimware image with name $FIRMWARE directly
-	in the below search path of root filesystem:
-		"/lib/firmware/updates/" UTS_RELEASE,
-		"/lib/firmware/updates",
-		"/lib/firmware/" UTS_RELEASE,
-		"/lib/firmware"
-	- If found, goto 7), else goto 2)
-
- 2), userspace:
+ kernel(driver): calls request_firmware(&fw_entry, $FIRMWARE, device)
+
+ userspace:
  	- /sys/class/firmware/xxx/{loading,data} appear.
 	- hotplug gets called with a firmware identifier in $FIRMWARE
 	  and the usual hotplug environment.
 		- hotplug: echo 1 > /sys/class/firmware/xxx/loading
 
- 3), kernel: Discard any previous partial load.
+ kernel: Discard any previous partial load.
 
- 4), userspace:
+ userspace:
 		- hotplug: cat appropriate_firmware_image > \
 					/sys/class/firmware/xxx/data
 
- 5), kernel: grows a buffer in PAGE_SIZE increments to hold the image as it
+ kernel: grows a buffer in PAGE_SIZE increments to hold the image as it
 	 comes in.
 
- 6), userspace:
+ userspace:
 		- hotplug: echo 0 > /sys/class/firmware/xxx/loading
 
- 7), kernel: request_firmware() returns and the driver has the firmware
+ kernel: request_firmware() returns and the driver has the firmware
 	 image in fw_entry->{data,size}. If something went wrong
 	 request_firmware() returns non-zero and fw_entry is set to
 	 NULL.
 
- 8), kernel(driver): Driver code calls release_firmware(fw_entry) releasing
+ kernel(driver): Driver code calls release_firmware(fw_entry) releasing
 		 the firmware image and any related resource.
 
  High level behavior (driver code):

trunk/Documentation/hwmon/fam15h_power

@@ -10,7 +10,7 @@ Supported chips:
   BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors
     (not yet published)
 
-Author: Andreas Herrmann <herrmann.der.user@googlemail.com>
+Author: Andreas Herrmann <andreas.herrmann3@amd.com>
 
 Description
 -----------