Commit 57d19e80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (39 commits)
  b43: fix comment typo reqest -> request
  Haavard Skinnemoen has left Atmel
  cris: typo in mach-fs Makefile
  Kconfig: fix copy/paste-ism for dell-wmi-aio driver
  doc: timers-howto: fix a typo ("unsgined")
  perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
  md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
  treewide: fix a few typos in comments
  regulator: change debug statement be consistent with the style of the rest
  Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
  audit: acquire creds selectively to reduce atomic op overhead
  rtlwifi: don't touch with treewide double semicolon removal
  treewide: cleanup continuations and remove logging message whitespace
  ath9k_hw: don't touch with treewide double semicolon removal
  include/linux/leds-regulator.h: fix syntax in example code
  tty: fix typo in descripton of tty_termios_encode_baud_rate
  xtensa: remove obsolete BKL kernel option from defconfig
  m68k: fix comment typo 'occcured'
  arch:Kconfig.locks Remove unused config option.
  treewide: remove extra semicolons
  ...
parents ee9ec4f8 e64851f5

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ S: Haifa, Israel 
N: Johannes Berg

E: johannes@sipsolutions.net

W: http://johannes.sipsolutions.net/

P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5

P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D  8532 E0F3 73F3 7BF9 099A

D: powerpc & 802.11 hacker



N: Stephen R. van den Berg (AKA BuGless)

Documentation/devicetree/bindings/powerpc/nintendo/wii.txt

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ Nintendo Wii device tree 
   - reg : should contain the SDHCI registers location and length

   - interrupts : should contain the SDHCI interrupt



1.j) The Inter-Processsor Communication (IPC) node

1.j) The Inter-Processor Communication (IPC) node



  Represent the Inter-Processor Communication interface. This interface

  enables communications between the Broadway and the Starlet processors.

Documentation/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ Who: Zhang Rui <rui.zhang@intel.com> 
What:	CONFIG_ACPI_PROCFS_POWER

When:	2.6.39

Why:	sysfs I/F for ACPI power devices, including AC and Battery,

        has been working in upstream kenrel since 2.6.24, Sep 2007.

        has been working in upstream kernel since 2.6.24, Sep 2007.

	In 2.6.37, we make the sysfs I/F always built in and this option

	disabled by default.

	Remove this option and the ACPI power procfs interface in 2.6.39.

Documentation/stable_api_nonsense.txt

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ operating system to suffer. 


In both of these instances, all developers agreed that these were

important changes that needed to be made, and they were made, with

relatively little pain.  If Linux had to ensure that it preserve a

relatively little pain.  If Linux had to ensure that it will preserve a

stable source interface, a new interface would have been created, and

the older, broken one would have had to be maintained over time, leading

to extra work for the USB developers.  Since all Linux USB developers do

Documentation/sysctl/vm.txt

+2 −2
Original line number Diff line number Diff line
@@ -481,10 +481,10 @@ the DMA zone. 
Type(A) is called as "Node" order. Type (B) is "Zone" order.



"Node order" orders the zonelists by node, then by zone within each node.

Specify "[Nn]ode" for zone order

Specify "[Nn]ode" for node order



"Zone Order" orders the zonelists by zone type, then by node within each

zone.  Specify "[Zz]one"for zode order.

zone.  Specify "[Zz]one" for zone order.



Specify "[Dd]efault" to request automatic configuration.  Autoconfiguration

will select "node" order in following case.

CRA Git | Maintained and supported by SUSTech CRA and CCSE