Commit d14b7a41 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 

Pull trivial tree from Jiri Kosina:
 "Trivial updates all over the place as usual."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
  Fix typo in include/linux/clk.h .
  pci: hotplug: Fix typo in pci
  iommu: Fix typo in iommu
  video: Fix typo in drivers/video
  Documentation: Add newline at end-of-file to files lacking one
  arm,unicore32: Remove obsolete "select MISC_DEVICES"
  module.c: spelling s/postition/position/g
  cpufreq: Fix typo in cpufreq driver
  trivial: typo in comment in mksysmap
  mach-omap2: Fix typo in debug message and comment
  scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
  Change email address for Steve Glendinning
  Btrfs: fix typo in convert_extent_bit
  via: Remove bogus if check
  netprio_cgroup.c: fix comment typo
  backlight: fix memory leak on obscure error path
  Documentation: asus-laptop.txt references an obsolete Kconfig item
  Documentation: ManagementStyle: fixed typo
  mm/vmscan: cleanup comment error in balance_pgdat
  mm: cleanup on the comments of zone_reclaim_stat
  ...
parents e8ff13b0 a58b3a4a

Documentation/ManagementStyle

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ sadly that you are one too, and that while we can all bask in the secure 
knowledge that we're better than the average person (let's face it,

nobody ever believes that they're average or below-average), we should

also admit that we're not the sharpest knife around, and there will be

other people that are less of an idiot that you are. 

other people that are less of an idiot than you are. 



Some people react badly to smart people.  Others take advantage of them.

Documentation/devices.txt

+2 −0
Original line number Diff line number Diff line
@@ -2416,6 +2416,8 @@ Your cooperation is appreciated. 
		  1 = /dev/raw/raw1	First raw I/O device

		  2 = /dev/raw/raw2	Second raw I/O device

		    ...

                 max minor number of raw device is set by kernel config

                 MAX_RAW_DEVS or raw module parameter 'max_raw_devs'



163 char

Documentation/laptops/asus-laptop.txt

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ Display switching 


  Debugging:

  1) Check whether the Fn+F8 key:

     a) does not lock the laptop (try disabling CONFIG_X86_UP_APIC or boot with

        noapic / nolapic if it does)

     a) does not lock the laptop (try a boot with noapic / nolapic if it does)

     b) generates events (0x6n, where n is the value corresponding to the

        configuration above)

     c) actually works

MAINTAINERS

+10 −10
Original line number Diff line number Diff line
@@ -6242,9 +6242,9 @@ F: Documentation/hwmon/smm665 
F:	drivers/hwmon/smm665.c



SMSC EMC2103 HARDWARE MONITOR DRIVER

M:	Steve Glendinning <steve.glendinning@smsc.com>

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	lm-sensors@lm-sensors.org

S:	Supported

S:	Maintained

F:	Documentation/hwmon/emc2103

F:	drivers/hwmon/emc2103.c
@@ -6263,22 +6263,22 @@ F: Documentation/hwmon/smsc47b397 
F:	drivers/hwmon/smsc47b397.c



SMSC911x ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@smsc.com>

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

S:	Supported

S:	Maintained

F:	include/linux/smsc911x.h

F:	drivers/net/ethernet/smsc/smsc911x.*



SMSC9420 PCI ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@smsc.com>

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

S:	Supported

S:	Maintained

F:	drivers/net/ethernet/smsc/smsc9420.*



SMSC UFX6000 and UFX7000 USB to VGA DRIVER

M:	Steve Glendinning <steve.glendinning@smsc.com>

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	linux-fbdev@vger.kernel.org

S:	Supported

S:	Maintained

F:	drivers/video/smscufx.c



SN-IA64 (Itanium) SUB-PLATFORM
@@ -7232,9 +7232,9 @@ S: Supported 
F:	drivers/usb/serial/whiteheat*



USB SMSC95XX ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@smsc.com>

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

S:	Supported

S:	Maintained

F:	drivers/net/usb/smsc95xx.*



USB SN9C1xx DRIVER

arch/arm/mach-davinci/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ config MACH_DAVINCI_EVM 
	bool "TI DM644x EVM"

	default ARCH_DAVINCI_DM644x

	depends on ARCH_DAVINCI_DM644x

	select MISC_DEVICES

	select EEPROM_AT24

	select I2C

	help
@@ -72,7 +71,6 @@ config MACH_DAVINCI_EVM 
config MACH_SFFSDR

	bool "Lyrtech SFFSDR"

	depends on ARCH_DAVINCI_DM644x

	select MISC_DEVICES

	select EEPROM_AT24

	select I2C

	help
@@ -106,7 +104,6 @@ config MACH_DAVINCI_DM6467_EVM 
	default ARCH_DAVINCI_DM646x

	depends on ARCH_DAVINCI_DM646x

	select MACH_DAVINCI_DM6467TEVM

	select MISC_DEVICES

	select EEPROM_AT24

	select I2C

	help
@@ -120,7 +117,6 @@ config MACH_DAVINCI_DM365_EVM 
	bool "TI DM365 EVM"

	default ARCH_DAVINCI_DM365

	depends on ARCH_DAVINCI_DM365

	select MISC_DEVICES

	select EEPROM_AT24

	select I2C

	help
@@ -132,7 +128,6 @@ config MACH_DAVINCI_DA830_EVM 
	default ARCH_DAVINCI_DA830

	depends on ARCH_DAVINCI_DA830

	select GPIO_PCF857X

	select MISC_DEVICES

	select EEPROM_AT24

	select I2C

	help
@@ -219,7 +214,6 @@ config MACH_TNETV107X 
config MACH_MITYOMAPL138

	bool "Critical Link MityDSP-L138/MityARM-1808 SoM"

	depends on ARCH_DAVINCI_DA850

	select MISC_DEVICES

	select EEPROM_AT24

	select I2C

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE