Commit 32bc6e09 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge'

parents 5cf13911 81b73dd9

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ include/config 
include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h



# stgit generated dirs

patches-*



# quilt's files

patches

series

Documentation/cpu-freq/user-guide.txt

+4 −1
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ scaling_min_freq and 
scaling_max_freq		show the current "policy limits" (in

				kHz). By echoing new values into these

				files, you can change these limits.

				NOTE: when setting a policy you need to

				first set scaling_max_freq, then

				scaling_min_freq.





If you have selected the "userspace" governor which allows you to

Documentation/infiniband/ipoib.txt

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ Debugging Information 


References



  IETF IP over InfiniBand (ipoib) Working Group

    http://ietf.org/html.charters/ipoib-charter.html

  Transmission of IP over InfiniBand (IPoIB) (RFC 4391)

    http://ietf.org/rfc/rfc4391.txt 

  IP over InfiniBand (IPoIB) Architecture (RFC 4392)

Documentation/sysctl/kernel.txt

+2 −3
Original line number Diff line number Diff line
@@ -211,9 +211,8 @@ Controls the kernel's behaviour when an oops or BUG is encountered. 


0: try to continue operation



1: delay a few seconds (to give klogd time to record the oops output) and

   then panic.  If the `panic' sysctl is also non-zero then the machine will

   be rebooted.

1: panic immediatly.  If the `panic' sysctl is also non-zero then the

   machine will be rebooted.



==============================================================

Documentation/usb/proc_usb_info.txt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ bind to an interface (or perhaps several) using an ioctl call. You 
would issue more ioctls to the device to communicate to it using

control, bulk, or other kinds of USB transfers.  The IOCTLs are

listed in the <linux/usbdevice_fs.h> file, and at this writing the

source code (linux/drivers/usb/devio.c) is the primary reference

source code (linux/drivers/usb/core/devio.c) is the primary reference

for how to access devices through those files.



Note that since by default these BBB/DDD files are writable only by